unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
* bug#11488: PATCH: Don't kill *vc-diff* on revert.
@ 2012-05-16 19:04 Aaron S. Hawley
  2012-05-29 11:43 ` Chong Yidong
  0 siblings, 1 reply; 2+ messages in thread
From: Aaron S. Hawley @ 2012-05-16 19:04 UTC (permalink / raw)
  To: 11488

When I hit C-x v u in a version controlled file, Emacs shows *vc-diff*
asks if you're sure then kills it.  I wish it would keep the buffer
around in case I want to undo my revert with Diff Mode.

Thanks for Emacs,
aaron

2012-05-04  Aaron S. Hawley  <aaron.s.hawley@gmail.com>

        * vc/vc.el (vc-revert, vc-rollback): Just quit *vc-diff* buffer
        don't kill it when reverting or rolling back.

--- vc/vc.el	2012-04-02 19:37:30.000000000 -0400
+++ vc/vc.el	2012-05-04 13:03:18.104977200 -0400
@@ -2303,7 +2303,7 @@
 				       (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)
@@ -2349,7 +2349,7 @@
     ;; 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





^ permalink raw reply	[flat|nested] 2+ messages in thread

* bug#11488: PATCH: Don't kill *vc-diff* on revert.
  2012-05-16 19:04 bug#11488: PATCH: Don't kill *vc-diff* on revert Aaron S. Hawley
@ 2012-05-29 11:43 ` Chong Yidong
  0 siblings, 0 replies; 2+ messages in thread
From: Chong Yidong @ 2012-05-29 11:43 UTC (permalink / raw)
  To: Aaron S. Hawley; +Cc: 11488

"Aaron S. Hawley" <aaron.s.hawley@gmail.com> writes:

> When I hit C-x v u in a version controlled file, Emacs shows *vc-diff*
> asks if you're sure then kills it.  I wish it would keep the buffer
> around in case I want to undo my revert with Diff Mode.

Looks good.  Committed; thanks.





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-05-29 11:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-16 19:04 bug#11488: PATCH: Don't kill *vc-diff* on revert Aaron S. Hawley
2012-05-29 11:43 ` Chong Yidong

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).