From e2bac5f625481e45ccd1a217af0cd211df461a20 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 30 Jun 2011 17:27:45 -0700 Subject: [PATCH] * emacs-lisp/benchmark.el (benchmark-elapse): Use float-time. --- lisp/ChangeLog | 1 + lisp/emacs-lisp/benchmark.el | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 346c290ab7b..ab071c79454 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,7 @@ * calendar/timeclock.el (timeclock-seconds-to-time): Defalias to seconds-to-time, since they're the same thing. + * emacs-lisp/benchmark.el (benchmark-elapse): * allout-widgets.el (allout-elapsed-time-seconds): Use float-time. 2011-06-30 Lars Magne Ingebrigtsen diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el index 86063c512c6..aa84a075b76 100644 --- a/lisp/emacs-lisp/benchmark.el +++ b/lisp/emacs-lisp/benchmark.el @@ -39,9 +39,8 @@ (setq ,t1 (current-time)) ,@forms (setq ,t2 (current-time)) - (+ (* (- (car ,t2) (car ,t1)) 65536.0) - (- (nth 1 ,t2) (nth 1 ,t1)) - (* (- (nth 2 ,t2) (nth 2 ,t1)) 1.0e-6))))) + (float-time (time-subtract ,t2 ,t1))))) + (put 'benchmark-elapse 'edebug-form-spec t) (put 'benchmark-elapse 'lisp-indent-function 0) -- 2.11.4.GIT