* nxml/rng-maint.el (rng-time-function): Rewrite using time-subtract.

This yields a more-accurate answer.
(rng-time-to-float): Remove; no longer needed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3751cea4287920ff0d16e2634784d58c0aa3e195..6175def190fe32102badf0fa90fcc80482089d95 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-07-01  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * nxml/rng-maint.el (rng-time-function): Rewrite using time-subtract.
+       This yields a more-accurate answer.
+       (rng-time-to-float): Remove; no longer needed.
+
        * emacs-lisp/timer.el (timer-relative-time): Use time-add.
 
        * calendar/timeclock.el (timeclock-seconds-to-time):

diff --git a/lisp/nxml/rng-maint.el b/lisp/nxml/rng-maint.el
index d31740f0ca2508586625ec1fd211757c19a1f47a..bd5b3136d540cd9b3322ecfbc401ff247fe418ed 100644 (file)
--- a/lisp/nxml/rng-maint.el
+++ b/lisp/nxml/rng-maint.el
@@ -224,19 +224,13 @@
 
 ;;; Timing
 
-(defun rng-time-to-float (time)
-  (+ (* (nth 0 time) 65536.0)
-     (nth 1 time)
-     (/ (nth 2 time) 1000000.0)))
-
 (defun rng-time-function (function &rest args)
   (let* ((start (current-time))
         (val (apply function args))
         (end (current-time)))
     (message "%s ran in %g seconds"
             function
-            (- (rng-time-to-float end)
-               (rng-time-to-float start)))
+            (float-time (time-subtract end start)))
     val))
 
 (defun rng-time-tokenize-buffer ()