X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/3f715d17fef56ee78a3df7ebb00d4e8b1aec37de..ab422c4d6899b1442cb6954c1829c1fb656b006c:/lisp/nxml/rng-maint.el

diff --git a/lisp/nxml/rng-maint.el b/lisp/nxml/rng-maint.el
index 183e2e27a0..74192f213d 100644
--- a/lisp/nxml/rng-maint.el
+++ b/lisp/nxml/rng-maint.el
@@ -1,6 +1,6 @@
 ;;; rng-maint.el --- commands for RELAX NG maintainers
 
-;; Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: XML, RelaxNG
@@ -46,8 +46,7 @@
 						       rng-dir)))
 	(texi-buf (find-file-noselect (expand-file-name rng-manual-texi
 							rng-dir))))
-    (save-excursion
-      (set-buffer texi-buf)
+    (with-current-buffer texi-buf
       (erase-buffer)
       (let ((standard-output texi-buf))
 	(princ (format "\\input texinfo @c -*- texinfo -*-\n\
@@ -212,14 +211,12 @@
 	     ))))
 
 (defun rng-manual-output-force-new-line ()
-  (save-excursion
-    (set-buffer standard-output)
+  (with-current-buffer standard-output
     (unless (eq (char-before) ?\n)
       (insert ?\n))))
 
 (defun rng-manual-output-force-blank-line ()
-  (save-excursion
-    (set-buffer standard-output)
+  (with-current-buffer standard-output
     (if (eq (char-before) ?\n)
 	(unless (eq (char-before (1- (point))) ?\n)
 	  (insert ?\n))
@@ -227,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 ()
@@ -278,5 +269,4 @@
   (while (rng-do-some-validation
 	  (lambda () t))))
 
-;; arch-tag: 4b8c6143-daac-4888-9c61-9bea6f935f17
 ;;; rng-maint.el ends here