[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc.el |
Date: |
Tue, 11 Apr 2006 23:05:36 +0000 |
Index: emacs/lisp/vc.el
diff -u emacs/lisp/vc.el:1.415 emacs/lisp/vc.el:1.416
--- emacs/lisp/vc.el:1.415 Tue Apr 11 21:42:05 2006
+++ emacs/lisp/vc.el Tue Apr 11 23:05:31 2006
@@ -886,7 +886,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))
@@ -3047,9 +3047,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)))
(cond ((null vc-annotate-display-mode)
;; The ratio is global, thus relative to the global color-map.
(kill-local-variable 'vc-annotate-color-map)