/[emacs]/emacs/lisp/vc.el
ViewVC logotype

Diff of /emacs/lisp/vc.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.334 by spiegel, Fri Jul 19 13:20:02 2002 UTC revision 1.335 by spiegel, Mon Jul 22 18:52:04 2002 UTC
# Line 1105  If VERBOSE is non-nil, query the user ra Line 1105  If VERBOSE is non-nil, query the user ra
1105    (let ((visited (get-file-buffer file))    (let ((visited (get-file-buffer file))
1106          state version)          state version)
1107      (when visited      (when visited
1108          (if vc-dired-mode
1109              (switch-to-buffer-other-window visited)
1110            (set-buffer visited))
1111        ;; Check relation of buffer and file, and make sure        ;; Check relation of buffer and file, and make sure
1112        ;; user knows what he's doing.  First, finding the file        ;; user knows what he's doing.  First, finding the file
1113        ;; will check whether the file on disk is newer.        ;; will check whether the file on disk is newer.
1114        (set-buffer visited)        ;; Ignore buffer-read-only during this test, and
1115        ;; ignore buffer-read-only during this test        ;; preserve find-file-literally.
1116        (let ((buffer-read-only (not (file-writable-p file))))        (let ((buffer-read-only (not (file-writable-p file))))
1117          (if vc-dired-mode          (find-file-noselect file nil find-file-literally))
             (find-file-other-window file)  
           (find-file-noselect file)))  
1118        (if (not (verify-visited-file-modtime (current-buffer)))        (if (not (verify-visited-file-modtime (current-buffer)))
1119            (if (yes-or-no-p "Replace file on disk with buffer contents? ")            (if (yes-or-no-p "Replace file on disk with buffer contents? ")
1120                (write-file (buffer-file-name))                (write-file (buffer-file-name))

Legend:
Removed from v.1.334  
changed lines
  Added in v.1.335

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26