Mercurial > emacs
diff lisp/vc.el @ 91085:880960b70474
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 11 Nov 2007 00:56:44 +0000 |
parents | 4bc33ffdda1a 613df1ba1584 |
children | 53108e6cea98 |
line wrap: on
line diff
--- a/lisp/vc.el Fri Nov 09 14:52:32 2007 +0000 +++ b/lisp/vc.el Sun Nov 11 00:56:44 2007 +0000 @@ -1286,7 +1286,7 @@ (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 @@ (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 @@ ;; 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")))))))