From 2adaf05797dbf20e645f0357dcf22fe308ae7bbe Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 5 Nov 2009 21:01:32 +0000 Subject: [PATCH] * 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. --- lisp/ChangeLog | 12 ++++++++++++ lisp/nxml/nxml-maint.el | 3 +-- lisp/nxml/nxml-parse.el | 6 ++---- lisp/nxml/rng-cmpct.el | 3 +-- lisp/nxml/rng-loc.el | 3 +-- lisp/nxml/rng-maint.el | 9 +++------ lisp/nxml/rng-parse.el | 3 +-- lisp/nxml/xmltok.el | 3 +-- lisp/nxml/xsd-regexp.el | 3 +-- 9 files changed, 23 insertions(+), 22 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 729c5436a3..1ecb9034b8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2009-11-05 Stefan Monnier + + * 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 * verilog-mode.el (verilog-getopt-file, verilog-set-define): diff --git a/lisp/nxml/nxml-maint.el b/lisp/nxml/nxml-maint.el index b8fd1d97ae..d877c4ffa5 100644 --- a/lisp/nxml/nxml-maint.el +++ b/lisp/nxml/nxml-maint.el @@ -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)) diff --git a/lisp/nxml/nxml-parse.el b/lisp/nxml/nxml-parse.el index 2b86c22789..3059132a09 100644 --- a/lisp/nxml/nxml-parse.el +++ b/lisp/nxml/nxml-parse.el @@ -98,16 +98,14 @@ modified buffer currently visiting FILE. 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)) diff --git a/lisp/nxml/rng-cmpct.el b/lisp/nxml/rng-cmpct.el index f357633c2e..d9e2900349 100644 --- a/lisp/nxml/rng-cmpct.el +++ b/lisp/nxml/rng-cmpct.el @@ -348,8 +348,7 @@ OVERRIDE is either nil, require or t." (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 diff --git a/lisp/nxml/rng-loc.el b/lisp/nxml/rng-loc.el index 5207d7aa5e..84ee27a44f 100644 --- a/lisp/nxml/rng-loc.el +++ b/lisp/nxml/rng-loc.el @@ -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) diff --git a/lisp/nxml/rng-maint.el b/lisp/nxml/rng-maint.el index 780e292c0f..24c903482a 100644 --- a/lisp/nxml/rng-maint.el +++ b/lisp/nxml/rng-maint.el @@ -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)) diff --git a/lisp/nxml/rng-parse.el b/lisp/nxml/rng-parse.el index d628e734f4..d4ed32d6c1 100644 --- a/lisp/nxml/rng-parse.el +++ b/lisp/nxml/rng-parse.el @@ -40,8 +40,7 @@ The returned list has the same form as that returned by 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) diff --git a/lisp/nxml/xmltok.el b/lisp/nxml/xmltok.el index a73efd27ba..9872a7acc1 100644 --- a/lisp/nxml/xmltok.el +++ b/lisp/nxml/xmltok.el @@ -1759,8 +1759,7 @@ Processing instruction does not start with a name" (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)) diff --git a/lisp/nxml/xsd-regexp.el b/lisp/nxml/xsd-regexp.el index 0cb4d3fdf2..64ed5f62cf 100644 --- a/lisp/nxml/xsd-regexp.el +++ b/lisp/nxml/xsd-regexp.el @@ -710,8 +710,7 @@ whose value is a range-list." "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]\\);" -- 2.20.1