unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* VC's handling of windows, esp. w.r.t annotate
@ 2006-04-11 20:39 Stefan Monnier
  2006-04-11 20:47 ` Andre Spiegel
  2006-04-11 21:04 ` JD Smith
  0 siblings, 2 replies; 4+ messages in thread
From: Stefan Monnier @ 2006-04-11 20:39 UTC (permalink / raw)
  Cc: emacs-devel


Any objection to the patch below?

One of the reasons for the first change is that when you use
vc-annotate-warp-version, you don't want it to pop up the original
unannotated source buffer, not even temporarily.


        Stefan


2006-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>

	* vc.el (vc-ensure-vc-buffer): Only change current-buffer, not the
	window configuration.
	(vc-annotate-display-select): Select the buffer so that current-buffer
	(and selected-window) is the output buffer at the end of vc-annotate.


Index: lisp/vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.414
diff -u -r1.414 vc.el
--- lisp/vc.el	7 Feb 2006 16:59:01 -0000	1.414
+++ lisp/vc.el	11 Apr 2006 20:37:29 -0000
@@ -852,7 +852,7 @@
   (if vc-dired-mode
       (set-buffer (find-file-noselect (dired-get-filename)))
     (while vc-parent-buffer
-      (pop-to-buffer vc-parent-buffer))
+      (set-buffer vc-parent-buffer))
     (if (not buffer-file-name)
 	(error "Buffer %s is not associated with a file" (buffer-name))
       (if (not (vc-backend buffer-file-name))
@@ -3013,9 +3013,7 @@
 use; you may override this using the second optional arg MODE."
   (interactive)
   (if mode (setq vc-annotate-display-mode mode))
-  (when buffer
-    (set-buffer buffer)
-    (display-buffer buffer))
+  (pop-to-buffer (or buffer (current-buffer)))
   (if (not vc-annotate-parent-rev)
       (vc-annotate-mode))
   (cond ((null vc-annotate-display-mode)

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

* Re: VC's handling of windows, esp. w.r.t annotate
  2006-04-11 20:39 VC's handling of windows, esp. w.r.t annotate Stefan Monnier
@ 2006-04-11 20:47 ` Andre Spiegel
  2006-04-11 23:04   ` Stefan Monnier
  2006-04-11 21:04 ` JD Smith
  1 sibling, 1 reply; 4+ messages in thread
From: Andre Spiegel @ 2006-04-11 20:47 UTC (permalink / raw)
  Cc: emacs-devel

On Tue, 2006-04-11 at 16:39 -0400, Stefan Monnier wrote:

> Any objection to the patch below?

Looks good to me.

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

* Re: VC's handling of windows, esp. w.r.t annotate
  2006-04-11 20:39 VC's handling of windows, esp. w.r.t annotate Stefan Monnier
  2006-04-11 20:47 ` Andre Spiegel
@ 2006-04-11 21:04 ` JD Smith
  1 sibling, 0 replies; 4+ messages in thread
From: JD Smith @ 2006-04-11 21:04 UTC (permalink / raw)


On Tue, 11 Apr 2006 16:39:33 -0400, Stefan Monnier wrote:

> Any objection to the patch below?

Thanks, Stefan, that provides the behavior I was interested in.

JD

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

* Re: VC's handling of windows, esp. w.r.t annotate
  2006-04-11 20:47 ` Andre Spiegel
@ 2006-04-11 23:04   ` Stefan Monnier
  0 siblings, 0 replies; 4+ messages in thread
From: Stefan Monnier @ 2006-04-11 23:04 UTC (permalink / raw)
  Cc: emacs-devel

>> Any objection to the patch below?

> Looks good to me.

Thanks, installed,


        Stefan

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

end of thread, other threads:[~2006-04-11 23:04 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-11 20:39 VC's handling of windows, esp. w.r.t annotate Stefan Monnier
2006-04-11 20:47 ` Andre Spiegel
2006-04-11 23:04   ` Stefan Monnier
2006-04-11 21:04 ` JD Smith

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).