* lisp/gnus/nnimap.el (nnimap-open-connection-1): Use tcp-keealive if possible.

[bpt/emacs.git] / lisp / cedet / semantic.el

diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index a83a9a4..34d886b 100644 (file)
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -1,7 +1,6 @@
 ;;; semantic.el --- Semantic buffer evaluator.
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: syntax tools
@@ -380,9 +379,7 @@ Do not set this yourself.  Call `semantic-debug'.")
 (defun semantic-elapsed-time (start end)
   "Copied from elp.el.  Was `elp-elapsed-time'.
 Argument START and END bound the time being calculated."
-  (+ (* (- (car end) (car start)) 65536.0)
-     (- (car (cdr end)) (car (cdr start)))
-     (/ (- (car (cdr (cdr end))) (car (cdr (cdr start)))) 1000000.0)))
+  (float-time (time-subtract end start)))
 
 (defun bovinate (&optional clear)
   "Parse the current buffer.  Show output in a temp buffer.
@@ -1058,8 +1055,10 @@ The possible elements of this list include the following:
 
 ;;;###autoload
 (define-minor-mode semantic-mode
-  "Toggle Semantic mode.
-With ARG, turn Semantic mode on if ARG is positive, off otherwise.
+  "Toggle parser features (Semantic mode).
+With a prefix argument ARG, enable Semantic mode if ARG is
+positive, and disable it otherwise.  If called from Lisp, enable
+Semantic mode if ARG is omitted or nil.
 
 In Semantic mode, Emacs parses the buffers you visit for their
 semantic content.  This information is used by a variety of