Merge from emacs-23

[gnu-emacs] / lisp / nxml / rng-loc.el

diff --git a/lisp/nxml/rng-loc.el b/lisp/nxml/rng-loc.el
index 5207d7aa5e4f70d5e74faae5dd72335d3553d021..5ba52c3e1236b6d753202eb3f0f1fd449e51f2a5 100644 (file)
--- a/lisp/nxml/rng-loc.el
+++ b/lisp/nxml/rng-loc.el
@@ -1,6 +1,6 @@
 ;;; rng-loc.el --- locate the schema to use for validation
 
-;; Copyright (C) 2003, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: James Clark
 ;; Keywords: XML, RelaxNG
@@ -508,8 +508,7 @@ saved to the first writable file in `rng-schema-locating-files'."
                                         "schema location")
                                       file)))))
          (t
-          (save-excursion
-            (set-buffer (find-file-noselect file))
+          (with-current-buffer (find-file-noselect file)
             (let ((modified (buffer-modified-p)))
               (if (> (buffer-size) 0)
                   (let (xmltok-dtd)