From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Fri, 7 Aug 2009 08:24:29 +0000 (+0000)
Subject: (vc-resynch-window): Update comment.
X-Git-Tag: emacs-pretest-23.1.90~1940
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3c53763cf24f7e7507fd3a941761aae836c0075e;p=emacs.git

(vc-resynch-window): Update comment.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ebf971f15f..bd4d60e43f7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2009-08-07  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* vc-dispatcher.el (vc-resynch-window): Update comment.
+
 	* term.el (term-handle-ansi-escape): Add comments with the
 	terminfo capabilities implemented.
 
diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el
index f03f16ede98..a209e139bc2 100644
--- a/lisp/vc-dispatcher.el
+++ b/lisp/vc-dispatcher.el
@@ -462,9 +462,10 @@ editing!"
        (if keep
 	   (progn
 	     (vc-revert-buffer-internal t noquery)
-             ;; TODO: Adjusting view mode might no longer be necessary
-             ;; after RMS change to files.el of 1999-08-08.  Investigate
-             ;; this when we install the new VC.
+
+	     ;; VC operations might toggle the read-only state.  In
+	     ;; that case we need to adjust the `view-mode' status
+	     ;; when `view-read-only' is non-nil.
              (and view-read-only
                   (if (file-writable-p file)
                       (and view-mode
@@ -473,6 +474,7 @@ editing!"
                     (and (not view-mode)
                          (not (eq (get major-mode 'mode-class) 'special))
                          (view-mode-enter))))
+
 	     (run-hook-with-args 'mode-line-hook buffer-file-name))
 	 (kill-buffer (current-buffer)))))