* vc/ediff-util.el (ediff-calc-command-time): Use time-since

and float-time.  Say "NNN.NNN seconds" rather than "NNN seconds
+ NNN microseconds".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b067b043ed69d7a2edd143a535b3890d9a12034..4bd6cd45671282c01db649d914f0aa02333a54a3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-07-01  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * vc/ediff-util.el (ediff-calc-command-time): Use time-since
+       and float-time.  Say "NNN.NNN seconds" rather than "NNN seconds
+       + NNN microseconds".
+
        * type-break.el (type-break-time-sum): Rewrite using time-add.
 
        * play/hanoi.el (hanoi-current-time-float): Remove.

diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 40ffea624fb17a9501d23d7d91be125e80e45d83..df6a7e938afcc9ba7fff0672f989df5adad6eeb7 100644 (file)
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -4144,15 +4144,9 @@ Mail anyway? (y or n) ")
 
 ;; calculate time used by command
 (defun ediff-calc-command-time ()
-  (let ((end (current-time))
-       micro sec)
-    (setq micro
-         (if (>= (nth 2 end) (nth 2 ediff-command-begin-time))
-             (- (nth 2 end) (nth 2 ediff-command-begin-time))
-           (+ (nth 2 end) (- 1000000 (nth 2 ediff-command-begin-time)))))
-    (setq sec (- (nth 1 end) (nth 1 ediff-command-begin-time)))
-    (or (equal ediff-command-begin-time '(0 0 0))
-       (message "Elapsed time: %d second(s) + %d microsecond(s)" sec micro))))
+  (or (equal ediff-command-begin-time '(0 0 0))
+      (message "Elapsed time: %g second(s)"
+              (float-time (time-since ediff-command-begin-time)))))
 
 (defsubst ediff-save-time ()
   (setq ediff-command-begin-time (current-time)))