X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/a9faac5c6333bcbfb30a00debf3de7a44e430e49..95a2cb24b0697558e6629460d8bc693b394f0138:/lisp/nxml/rng-maint.el

diff --git a/lisp/nxml/rng-maint.el b/lisp/nxml/rng-maint.el
index 7a6f3377f6..be42e1029c 100644
--- a/lisp/nxml/rng-maint.el
+++ b/lisp/nxml/rng-maint.el
@@ -1,9 +1,9 @@
 ;;; rng-maint.el --- commands for RELAX NG maintainers
 
-;; Copyright (C) 2003, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007-2015 Free Software Foundation, Inc.
 
 ;; Author: James Clark
-;; Keywords: XML, RelaxNG
+;; Keywords: wp, hypermedia, languages, XML, RelaxNG
 
 ;; This file is part of GNU Emacs.
 
@@ -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 ()
@@ -265,7 +259,7 @@
 (defun rng-validate-buffer ()
   (save-restriction
     (widen)
-    (nxml-with-unmodifying-text-property-changes
+    (with-silent-modifications
       (rng-clear-cached-state (point-min) (point-max)))
     ;; 1+ to clear empty overlays at (point-max)
     (rng-clear-overlays (point-min) (1+ (point-max))))