Mercurial > emacs
changeset 46623:9ed0e3821f7a
(vc-next-action-on-file): Preserve find-file-literally.
| author | André Spiegel <spiegel@gnu.org> |
|---|---|
| date | Mon, 22 Jul 2002 18:52:04 +0000 |
| parents | 7ac7ae3b6a36 |
| children | f6e7adb19ace |
| files | lisp/vc.el |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc.el Mon Jul 22 16:15:53 2002 +0000 +++ b/lisp/vc.el Mon Jul 22 18:52:04 2002 +0000 @@ -6,7 +6,7 @@ ;; Maintainer: Andre Spiegel <spiegel@gnu.org> ;; Keywords: tools -;; $Id: vc.el,v 1.333 2002/07/16 20:44:23 monnier Exp $ +;; $Id: vc.el,v 1.334 2002/07/19 13:20:02 spiegel Exp $ ;; This file is part of GNU Emacs. @@ -1105,15 +1105,16 @@ (let ((visited (get-file-buffer file)) state version) (when visited + (if vc-dired-mode + (switch-to-buffer-other-window visited) + (set-buffer visited)) ;; Check relation of buffer and file, and make sure ;; user knows what he's doing. First, finding the file ;; will check whether the file on disk is newer. - (set-buffer visited) - ;; ignore buffer-read-only during this test + ;; Ignore buffer-read-only during this test, and + ;; preserve find-file-literally. (let ((buffer-read-only (not (file-writable-p file)))) - (if vc-dired-mode - (find-file-other-window file) - (find-file-noselect file))) + (find-file-noselect file nil find-file-literally)) (if (not (verify-visited-file-modtime (current-buffer))) (if (yes-or-no-p "Replace file on disk with buffer contents? ") (write-file (buffer-file-name))