* x-dnd.el (x-dnd-maybe-call-test-function):

* window.el (split-window-vertically):
* whitespace.el (whitespace-help-on):
* vc-rcs.el (vc-rcs-consult-headers):
* userlock.el (ask-user-about-lock-help)
(ask-user-about-supersession-help):
* type-break.el (type-break-force-mode-line-update):
* time-stamp.el (time-stamp-conv-warn):
* terminal.el (te-set-output-log, te-more-break, te-filter)
(te-sentinel,terminal-emulator):
* term.el (make-term, term-exec, term-sentinel, term-read-input-ring)
(term-write-input-ring, term-check-source, term-start-output-log):
(term-display-buffer-line, term-dynamic-list-completions):
(term-ansi-make-term, serial-term):
* subr.el (selective-display):
* strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer)
(strokes-encode-buffer, strokes-xpm-for-compressed-string):
* speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info)
(speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support)
(speedbar-remove-localized-speedbar-support)
(speedbar-set-mode-line-format, speedbar-create-tag-hierarchy)
(speedbar-update-special-contents, speedbar-buffer-buttons-engine)
(speedbar-buffers-line-directory):
* simple.el (shell-command-on-region, append-to-buffer)
(prepend-to-buffer):
* shadowfile.el (shadow-save-todo-file):
* scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1)
(scroll-bar-maybe-set-window-start):
* sb-image.el (speedbar-image-dump):
* saveplace.el (save-place-alist-to-file, save-places-to-alist)
(load-save-place-alist-from-file):
* ps-samp.el (ps-print-message-from-summary):
* ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox)
(ps-background-image, ps-begin-job, ps-do-despool):
* ps-bdf.el (bdf-find-file, bdf-read-font-info):
* printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting)
(pr-ps-message-from-summary, pr-lpr-message-from-summary):
(pr-call-process, pr-file-list, pr-interface-save):
* novice.el (disabled-command-function)
(enable-command, disable-command):
* mouse.el (mouse-buffer-menu-alist):
* mouse-copy.el (mouse-kill-preserving-secondary):
* macros.el (kbd-macro-query):
* ledit.el (ledit-go-to-lisp, ledit-go-to-liszt):
* informat.el (batch-info-validate):
* ido.el (ido-copy-current-word, ido-initiate-auto-merge):
* hippie-exp.el (try-expand-dabbrev-visible):
* help-mode.el (help-make-xrefs):
* help-fns.el (describe-variable):
* generic-x.el (bat-generic-mode-run-as-comint):
* finder.el (finder-mouse-select):
* find-dired.el (find-dired-sentinel):
* filesets.el (filesets-file-close):
* files.el (list-directory):
* faces.el (list-faces-display, describe-face):
* facemenu.el (list-colors-display):
* ezimage.el (ezimage-image-association-dump, ezimage-image-dump):
* epg.el (epg--process-filter, epg-cancel):
* epa.el (epa--marked-keys, epa--select-keys, epa-display-info)
(epa--read-signature-type):
* emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B)
(emerge-file-names):
* ehelp.el (electric-helpify):
* ediff.el (ediff-regions-wordwise, ediff-regions-linewise):
* ediff-vers.el (rcs-ediff-view-revision):
* ediff-util.el (ediff-setup):
* ediff-mult.el (ediff-append-custom-diff):
* ediff-diff.el (ediff-exec-process, ediff-process-sentinel)
(ediff-wordify):
* echistory.el (Electric-command-history-redo-expression):
* dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
* disp-table.el (describe-display-table):
* dired.el (dired-find-buffer-nocreate):
* dired-aux.el (dired-rename-subdir, dired-dwim-target-directory):
* dabbrev.el (dabbrev--same-major-mode-p):
* chistory.el (list-command-history):
* apropos.el (apropos-documentation):
* allout.el (allout-obtain-passphrase):
(allout-copy-exposed-to-buffer):
(allout-verify-passphrase): Use with-current-buffer.

1 files changed, 58 insertions, 59 deletions

diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index 7352cbc4b6d..ddc27e4b36c 100644
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -1055,65 +1055,64 @@ Returns: nil            if no headers were found
   (cond
    ((not (get-file-buffer file)) nil)
    ((let (status version locking-user)
-     (save-excursion
-      (set-buffer (get-file-buffer file))
-      (goto-char (point-min))
-      (cond
-       ;; search for $Id or $Header
-       ;; -------------------------
-       ;; The `\ 's below avoid an RCS 5.7 bug when checking in this file.
-       ((or (and (search-forward "$Id\ : " nil t)
-		 (looking-at "[^ ]+ \\([0-9.]+\\) "))
-	    (and (progn (goto-char (point-min))
-			(search-forward "$Header\ : " nil t))
-		 (looking-at "[^ ]+ \\([0-9.]+\\) ")))
-	(goto-char (match-end 0))
-	;; if found, store the revision number ...
-	(setq version (match-string-no-properties 1))
-	;; ... and check for the locking state
-	(cond
-	 ((looking-at
-	   (concat "[0-9]+[/-][01][0-9][/-][0-3][0-9] "             ; date
-	    "[0-2][0-9]:[0-5][0-9]+:[0-6][0-9]+\\([+-][0-9:]+\\)? " ; time
-	           "[^ ]+ [^ ]+ "))                       ; author & state
-	  (goto-char (match-end 0)) ; [0-6] in regexp handles leap seconds
-	  (cond
-	   ;; unlocked revision
-	   ((looking-at "\\$")
-	    (setq locking-user 'none)
-	    (setq status 'rev-and-lock))
-	   ;; revision is locked by some user
-	   ((looking-at "\\([^ ]+\\) \\$")
-	    (setq locking-user (match-string-no-properties 1))
-	    (setq status 'rev-and-lock))
-	   ;; everything else: false
-	   (nil)))
-	 ;; unexpected information in
-	 ;; keyword string --> quit
-	 (nil)))
-       ;; search for $Revision
-       ;; --------------------
-       ((re-search-forward (concat "\\$"
-				   "Revision: \\([0-9.]+\\) \\$")
-			   nil t)
-	;; if found, store the revision number ...
-	(setq version (match-string-no-properties 1))
-	;; and see if there's any lock information
-	(goto-char (point-min))
-	(if (re-search-forward (concat "\\$" "Locker:") nil t)
-	    (cond ((looking-at " \\([^ ]+\\) \\$")
-		   (setq locking-user (match-string-no-properties 1))
-		   (setq status 'rev-and-lock))
-		  ((looking-at " *\\$")
-		   (setq locking-user 'none)
-		   (setq status 'rev-and-lock))
-		  (t
-		   (setq locking-user 'none)
-		   (setq status 'rev-and-lock)))
-	  (setq status 'rev)))
-       ;; else: nothing found
-       ;; -------------------
-       (t nil)))
+      (with-current-buffer (get-file-buffer file)
+        (goto-char (point-min))
+        (cond
+         ;; search for $Id or $Header
+         ;; -------------------------
+         ;; The `\ 's below avoid an RCS 5.7 bug when checking in this file.
+         ((or (and (search-forward "$Id\ : " nil t)
+                   (looking-at "[^ ]+ \\([0-9.]+\\) "))
+              (and (progn (goto-char (point-min))
+                          (search-forward "$Header\ : " nil t))
+                   (looking-at "[^ ]+ \\([0-9.]+\\) ")))
+          (goto-char (match-end 0))
+          ;; if found, store the revision number ...
+          (setq version (match-string-no-properties 1))
+          ;; ... and check for the locking state
+          (cond
+           ((looking-at
+             (concat "[0-9]+[/-][01][0-9][/-][0-3][0-9] "             ; date
+              "[0-2][0-9]:[0-5][0-9]+:[0-6][0-9]+\\([+-][0-9:]+\\)? " ; time
+                     "[^ ]+ [^ ]+ "))                       ; author & state
+            (goto-char (match-end 0)) ; [0-6] in regexp handles leap seconds
+            (cond
+             ;; unlocked revision
+             ((looking-at "\\$")
+              (setq locking-user 'none)
+              (setq status 'rev-and-lock))
+             ;; revision is locked by some user
+             ((looking-at "\\([^ ]+\\) \\$")
+              (setq locking-user (match-string-no-properties 1))
+              (setq status 'rev-and-lock))
+             ;; everything else: false
+             (nil)))
+           ;; unexpected information in
+           ;; keyword string --> quit
+           (nil)))
+         ;; search for $Revision
+         ;; --------------------
+         ((re-search-forward (concat "\\$"
+                                     "Revision: \\([0-9.]+\\) \\$")
+                             nil t)
+          ;; if found, store the revision number ...
+          (setq version (match-string-no-properties 1))
+          ;; and see if there's any lock information
+          (goto-char (point-min))
+          (if (re-search-forward (concat "\\$" "Locker:") nil t)
+              (cond ((looking-at " \\([^ ]+\\) \\$")
+                     (setq locking-user (match-string-no-properties 1))
+                     (setq status 'rev-and-lock))
+                    ((looking-at " *\\$")
+                     (setq locking-user 'none)
+                     (setq status 'rev-and-lock))
+                    (t
+                     (setq locking-user 'none)
+                     (setq status 'rev-and-lock)))
+            (setq status 'rev)))
+         ;; else: nothing found
+         ;; -------------------
+         (t nil)))
      (if status (vc-file-setprop file 'vc-working-revision version))
      (and (eq status 'rev-and-lock)
 	  (vc-file-setprop file 'vc-state