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
455e4fa1
Commit
455e4fa1
authored
Jul 09, 2011
by
Bob Rogers
Committed by
Chong Yidong
Jul 09, 2011
Browse files
* vc/vc.el (vc-diff-internal): Fix race condition (Bug#1256).
parent
8e0bc3e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/vc/vc.el
lisp/vc/vc.el
+5
-2
No files found.
lisp/ChangeLog
View file @
455e4fa1
2011-07-10 Bob Rogers <rogers@rgrjr.dyndns.org>
* vc/vc.el (vc-diff-internal): Fix race condition (Bug#1256).
2011-07-10 Chong Yidong <cyd@stupidchicken.com>
* window.el (display-buffer): Fix arguments to
...
...
lisp/vc/vc.el
View file @
455e4fa1
...
...
@@ -1605,10 +1605,13 @@ Return t if the buffer had changes, nil otherwise."
;; bindings are nicer for read only buffers. pcl-cvs does the
;; same thing.
(
setq
buffer-read-only
t
)
(
vc-exec-after
`
(
vc-diff-finish
,
(
current-buffer
)
',
(
when
verbose
messages
)))
;; Display the buffer, but at the end because it can change point.
(
pop-to-buffer
(
current-buffer
))
;; The diff process may finish early, so call `vc-diff-finish'
;; after `pop-to-buffer'; the former assumes the diff buffer is
;; shown in some window.
(
vc-exec-after
`
(
vc-diff-finish
,
(
current-buffer
)
',
(
when
verbose
messages
)))
;; 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