Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283

1 files changed, 7 insertions, 5 deletions

diff --git a/lisp/vc.el b/lisp/vc.el
index be6e8c5883b..5811b2f7d63 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1286,7 +1286,7 @@ Otherwise, throw an error."
 	   (message "All version-controlled files below %s selected."
 		    default-directory)
 	   (list default-directory)))
-	((and allow-unregistered (not (vc-registered buffer-file-name))) 
+	((and allow-unregistered (not (vc-registered buffer-file-name)))
 	 (list buffer-file-name))
 	(t (error "No fileset is available here."))))
 
@@ -1930,9 +1930,11 @@ returns t if the buffer had changes, nil otherwise."
           (message "No changes between %s and %s" rev1-name rev2-name)
           nil)
       (pop-to-buffer (current-buffer))
-      ;; Gnus-5.8.5 sets up an autoload for diff-mode, even if it's
-      ;; not available.  Work around that.
-      (if (require 'diff-mode nil t) (diff-mode))
+      (diff-mode)
+      ;; Make the *vc-diff* buffer read only, the diff-mode key
+      ;; bindings are nicer for read only buffers. pcl-cvs does the
+      ;; same thing.
+      (setq buffer-read-only t)
       (vc-exec-after `(vc-diff-sentinel ,verbose ,rev1-name ,rev2-name))
       ;; In the async case, we return t even if there are no differences
       ;; because we don't know that yet.
@@ -3324,7 +3326,7 @@ mode-specific menu.  `vc-annotate-color-map' and
           ;; of the user's cursor :-(
           (when ,current-line           ;(and (bobp))
             (goto-line ,current-line)
-            (setq vc-sentinel-movepoint))
+            (setq vc-sentinel-movepoint (point)))
           (unless (active-minibuffer-window)
             (message "Annotating... done")))))))