Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-18 02:47:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

(vc-diff-internal): Pop-to-buffer later.

Browse source
This commit is contained in:
Stefan Monnier 2007-11-15 16:33:08 +00:00
parent 58da34c73b
commit 4befebc175
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ChangeLog
View file

@ -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

3
lisp/vc.el
View file

@ -1938,13 +1938,14 @@ returns t if the buffer had changes, nil otherwise."
(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)))