mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00
Code Issues Releases Activity

* vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on revert.

Browse Source 
Fixes: debbugs:11488
This commit is contained in:
Aaron S. Hawley 2012-05-29 19:41:45 +08:00 committed by Chong Yidong
parent b9cb23871e
commit 2b311310c3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
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

4
lisp/vc/vc.el
View File

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