[Emacs-diffs] emacs/lisp ChangeLog nxml/nxml-maint.el nxml/nx...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/11/05 21:01:35

Modified files:
        lisp           : ChangeLog 
        lisp/nxml      : nxml-maint.el nxml-parse.el rng-cmpct.el 
                         rng-loc.el rng-maint.el rng-parse.el xmltok.el 
                         xsd-regexp.el 

Log message:
        * nxml/xsd-regexp.el (xsdre-gen-categories):
        * nxml/xmltok.el (xmltok-parse-entity):
        * nxml/rng-parse.el (rng-parse-validate-file):
        * nxml/rng-maint.el (rng-format-manual, 
rng-manual-output-force-new-line):
        * nxml/rng-loc.el (rng-save-schema-location-1):
        * nxml/rng-cmpct.el (rng-c-parse-file):
        * nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set):
        * nxml/nxml-parse.el (nxml-parse-file): Use with-current-buffer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16567&r2=1.16568
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/nxml/nxml-maint.el?cvsroot=emacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/nxml/nxml-parse.el?cvsroot=emacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/nxml/rng-cmpct.el?cvsroot=emacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/nxml/rng-loc.el?cvsroot=emacs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/nxml/rng-maint.el?cvsroot=emacs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/nxml/rng-parse.el?cvsroot=emacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/nxml/xmltok.el?cvsroot=emacs&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/nxml/xsd-regexp.el?cvsroot=emacs&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16567
retrieving revision 1.16568
diff -u -b -r1.16567 -r1.16568
--- ChangeLog   5 Nov 2009 20:54:34 -0000       1.16567
+++ ChangeLog   5 Nov 2009 21:01:32 -0000       1.16568
@@ -1,3 +1,15 @@
+2009-11-05  Stefan Monnier  <address@hidden>
+
+       * nxml/xsd-regexp.el (xsdre-gen-categories):
+       * nxml/xmltok.el (xmltok-parse-entity):
+       * nxml/rng-parse.el (rng-parse-validate-file):
+       * nxml/rng-maint.el (rng-format-manual)
+       (rng-manual-output-force-new-line):
+       * nxml/rng-loc.el (rng-save-schema-location-1):
+       * nxml/rng-cmpct.el (rng-c-parse-file):
+       * nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set):
+       * nxml/nxml-parse.el (nxml-parse-file): Use with-current-buffer.
+
 2009-11-05  Wilson Snyder  <address@hidden>
 
        * verilog-mode.el (verilog-getopt-file, verilog-set-define):

Index: nxml/nxml-maint.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/nxml/nxml-maint.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- nxml/nxml-maint.el  5 Jan 2009 03:22:51 -0000       1.6
+++ nxml/nxml-maint.el  5 Nov 2009 21:01:35 -0000       1.7
@@ -74,8 +74,7 @@
 (defun nxml-insert-target-repertoire-glyph-set (file var)
   (interactive "fTarget file: \nSVariable name: ")
   (let (lst head)
-    (save-excursion
-      (set-buffer (find-file-noselect file))
+    (with-current-buffer (find-file-noselect file)
       (goto-char (point-min))
       (while (re-search-forward "^ *\\([a-FA-F0-9]\\{2\\}\\)[ \t]+" nil t)
        (let ((row (match-string 1))

Index: nxml/nxml-parse.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/nxml/nxml-parse.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- nxml/nxml-parse.el  5 Jan 2009 03:22:52 -0000       1.7
+++ nxml/nxml-parse.el  5 Nov 2009 21:01:35 -0000       1.8
@@ -98,16 +98,14 @@
 If the variable `nxml-validate-function' is non-nil, it will be called
 twice for each element, and any reported error will be signaled in the
 same way as well-formedness error."
-  (save-excursion
-    (set-buffer (nxml-parse-find-file file))
+  (with-current-buffer (nxml-parse-find-file file)
     (unwind-protect
        (let ((nxml-parse-file-name file))
          (nxml-parse-instance))
       (kill-buffer nil))))
 
 (defun nxml-parse-find-file (file)
-  (save-excursion
-    (set-buffer (get-buffer-create " *nXML Parse*"))
+  (with-current-buffer (get-buffer-create " *nXML Parse*")
     (erase-buffer)
     (let ((set-auto-coding-function 'nxml-set-xml-coding))
       (insert-file-contents file))

Index: nxml/rng-cmpct.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/nxml/rng-cmpct.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- nxml/rng-cmpct.el   5 Jan 2009 03:22:53 -0000       1.7
+++ nxml/rng-cmpct.el   5 Nov 2009 21:01:35 -0000       1.8
@@ -348,8 +348,7 @@
 (defvar rng-c-file-index nil)
 
 (defun rng-c-parse-file (filename &optional context)
-  (save-excursion
-    (set-buffer (get-buffer-create (rng-c-buffer-name context)))
+  (with-current-buffer (get-buffer-create (rng-c-buffer-name context))
     (erase-buffer)
     (rng-c-init-buffer)
     (setq rng-c-file-name

Index: nxml/rng-loc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/nxml/rng-loc.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- nxml/rng-loc.el     5 Jan 2009 03:22:53 -0000       1.9
+++ nxml/rng-loc.el     5 Nov 2009 21:01:35 -0000       1.10
@@ -508,8 +508,7 @@
                                         "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)

Index: nxml/rng-maint.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/nxml/rng-maint.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- nxml/rng-maint.el   5 Jan 2009 03:22:53 -0000       1.10
+++ nxml/rng-maint.el   5 Nov 2009 21:01:35 -0000       1.11
@@ -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))

Index: nxml/rng-parse.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/nxml/rng-parse.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- nxml/rng-parse.el   5 Jan 2009 03:22:54 -0000       1.6
+++ nxml/rng-parse.el   5 Nov 2009 21:01:35 -0000       1.7
@@ -40,8 +40,7 @@
 for validation, such as returned by the function `rng-c-load-schema'.
 If the XML document is invalid with respect to schema, an error will
 be signaled in the same way as when it is not well-formed."
-  (save-excursion
-    (set-buffer (nxml-parse-find-file file))
+  (with-current-buffer (nxml-parse-find-file file)
     (unwind-protect
        (let ((nxml-parse-file-name file)
              (nxml-validate-function 'rng-parse-do-validate)

Index: nxml/xmltok.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/nxml/xmltok.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- nxml/xmltok.el      5 Jan 2009 03:22:55 -0000       1.8
+++ nxml/xmltok.el      5 Nov 2009 21:01:35 -0000       1.9
@@ -1759,8 +1759,7 @@
        (setcdr name-def 'not-well-formed) ; avoid infinite expansion loops
        (setq buf (get-buffer-create
                   (format " *Entity %s*" (car name-def))))
-       (save-excursion
-         (set-buffer buf)
+       (with-current-buffer buf
          (erase-buffer)
          (insert def)
          (goto-char (point-min))

Index: nxml/xsd-regexp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/nxml/xsd-regexp.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- nxml/xsd-regexp.el  5 Jan 2009 03:22:56 -0000       1.7
+++ nxml/xsd-regexp.el  5 Nov 2009 21:01:35 -0000       1.8
@@ -710,8 +710,7 @@
   "Use a UnicodeData file to generate code to initialize Unicode categories.
 Code is inserted into the current buffer."
   (interactive "fUnicodeData file: ")
-  (save-excursion
-    (set-buffer (find-file-noselect file))
+  (with-current-buffer (find-file-noselect file)
     (goto-char (point-min))
     (mapc (lambda (x) (put x 'xsdre-ranges nil)) xsdre-gen-categories)
     (while (re-search-forward "^\\([0-9A-Fa-f]*\\);[^;]*;\\([A-Z][a-z]\\);"