aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-06-30 17:24:48 -0700
committerPaul Eggert2011-06-30 17:24:48 -0700
commit98768aebbe64e37b189364cf460aa4524339e3c0 (patch)
tree42340f122b86ba2fb14b4fa749788fa4733a5fdd
parent5777162a3e3c6425f300f2e6c949887b1d7a3d40 (diff)
downloademacs-98768aebbe64e37b189364cf460aa4524339e3c0.tar.gz
emacs-98768aebbe64e37b189364cf460aa4524339e3c0.zip
* semantic.el (semantic-elapsed-time): Rewrite using
time-subtract and float-time.
-rw-r--r--lisp/cedet/ChangeLog5
-rw-r--r--lisp/cedet/semantic.el4
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 8c12806df1e..75948ef8d18 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,8 @@
12011-07-01 Paul Eggert <eggert@cs.ucla.edu>
2
3 * semantic.el (semantic-elapsed-time): Rewrite using
4 time-subtract and float-time.
5
12011-05-11 Glenn Morris <rgm@gnu.org> 62011-05-11 Glenn Morris <rgm@gnu.org>
2 7
3 * semantic/wisent/javascript.el (semantic-get-local-variables): 8 * semantic/wisent/javascript.el (semantic-get-local-variables):
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index c899988dc36..ce9af0e12b5 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -379,9 +379,7 @@ Do not set this yourself. Call `semantic-debug'.")
379(defun semantic-elapsed-time (start end) 379(defun semantic-elapsed-time (start end)
380 "Copied from elp.el. Was `elp-elapsed-time'. 380 "Copied from elp.el. Was `elp-elapsed-time'.
381Argument START and END bound the time being calculated." 381Argument START and END bound the time being calculated."
382 (+ (* (- (car end) (car start)) 65536.0) 382 (float-time (time-subtract end start)))
383 (- (car (cdr end)) (car (cdr start)))
384 (/ (- (car (cdr (cdr end))) (car (cdr (cdr start)))) 1000000.0)))
385 383
386(defun bovinate (&optional clear) 384(defun bovinate (&optional clear)
387 "Parse the current buffer. Show output in a temp buffer. 385 "Parse the current buffer. Show output in a temp buffer.