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
2b311310
Commit
2b311310
authored
May 29, 2012
by
Aaron S. Hawley
Committed by
Chong Yidong
May 29, 2012
Browse files
* vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on revert.
Fixes: debbugs:11488
parent
b9cb2387
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/vc/vc.el
lisp/vc/vc.el
+2
-2
No files found.
lisp/ChangeLog
View file @
2b311310
2012-05-29 Aaron S. Hawley <aaron.s.hawley@gmail.com>
* vc/vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on
revert (Bug#11488).
2012-05-29 Juri Linkov <juri@jurta.org>
* isearch.el (isearch-mode-map): Bind `M-s _' to
...
...
lisp/vc/vc.el
View file @
2b311310
...
...
@@ -2285,7 +2285,7 @@ to the working revision (except for keyword expansion)."
(
if
(
=
nfiles
1
)
""
"s"
))))))
(
error
"Revert canceled"
)))
(
when
diff-buffer
(
quit-windows-on
diff-buffer
t
)))
(
quit-windows-on
diff-buffer
)))
(
dolist
(
file
files
)
(
message
"Reverting %s..."
(
vc-delistify
files
))
(
vc-revert-file
file
)
...
...
@@ -2331,7 +2331,7 @@ depending on the underlying version-control system."
;; Display changes
(
unless
(
yes-or-no-p
"Discard these revisions? "
)
(
error
"Rollback canceled"
))
(
quit-windows-on
"*vc-diff*"
t
)
(
quit-windows-on
"*vc-diff*"
)
;; Do the actual reversions
(
message
"Rolling back %s..."
(
vc-delistify
files
))
(
with-vc-properties
...
...
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