Mercurial > emacs

changeset 104169:dc97cf5c3f82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-resynch-window): Update comment.
author Dan Nicolaescu <dann@ics.uci.edu>
date Fri, 07 Aug 2009 08:24:29 +0000
parents ffb29f8afea3
children 3049e183cd1a
files lisp/ChangeLog lisp/vc-dispatcher.el
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Aug 07 07:04:02 2009 +0000
+++ b/lisp/ChangeLog	Fri Aug 07 08:24:29 2009 +0000
@@ -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.
 
--- a/lisp/vc-dispatcher.el	Fri Aug 07 07:04:02 2009 +0000
+++ b/lisp/vc-dispatcher.el	Fri Aug 07 08:24:29 2009 +0000
@@ -462,9 +462,10 @@
        (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 @@
                     (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)))))