Mercurial > emacs
changeset 86100:ac69f23a84ce
(vc-diff-internal): Pop-to-buffer later.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 15 Nov 2007 16:33:08 +0000 |
| parents | 48dc79c663f4 |
| children | 27ff4954e2a0 |
| files | lisp/ChangeLog lisp/vc.el |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Nov 15 16:03:00 2007 +0000 +++ b/lisp/ChangeLog Thu Nov 15 16:33:08 2007 +0000 @@ -1,5 +1,7 @@ 2007-11-15 Stefan Monnier <monnier@iro.umontreal.ca> + * vc.el (vc-diff-internal): Pop-to-buffer later. + * subr.el (event-modifiers): Use internal-event-symbol-parse-modifiers. * pcvs.el (cvs-revert-if-needed): Ignore `unknown' files, since cvs
--- a/lisp/vc.el Thu Nov 15 16:03:00 2007 +0000 +++ b/lisp/vc.el Thu Nov 15 16:33:08 2007 +0000 @@ -1938,13 +1938,14 @@ (progn (message "No changes between %s and %s" rev1-name rev2-name) nil) - (pop-to-buffer (current-buffer)) (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)) + ;; Display the buffer, but at the end because it can change point. + (pop-to-buffer (current-buffer)) ;; In the async case, we return t even if there are no differences ;; because we don't know that yet. t)))