Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
4befebc1
Commit
4befebc1
authored
Nov 15, 2007
by
Stefan Monnier
Browse files
(vc-diff-internal): Pop-to-buffer later.
parent
58da34c7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
lisp/ChangeLog
lisp/ChangeLog
+2
-0
lisp/vc.el
lisp/vc.el
+2
-1
No files found.
lisp/ChangeLog
View file @
4befebc1
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
...
...
lisp/vc.el
View file @
4befebc1
...
...
@@ -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)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment