Mercurial > emacs
changeset 69943:7d69833e0c1a
(vc-ensure-vc-buffer): Only change current-buffer, not the window config.
(vc-annotate-display-select): Select the buffer so that current-buffer
(and selected-window) is the output buffer at the end of vc-annotate.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 11 Apr 2006 23:05:31 +0000 |
| parents | 45937d0cd26d |
| children | a87e26272828 |
| files | lisp/ChangeLog lisp/vc.el |
| diffstat | 2 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Apr 11 22:09:49 2006 +0000 +++ b/lisp/ChangeLog Tue Apr 11 23:05:31 2006 +0000 @@ -1,6 +1,13 @@ +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. + 2006-04-11 J.D. Smith <jdsmith@as.arizona.edu> - * vc.el (vc-annotate-color-map): Added custom TTY color map for + * vc.el (vc-annotate-color-map): Add custom TTY color map for 8-color terminals, to use all of the colors in a sensible order. 256-color terminals work well with the standard map. (vc-annotate-lines): Only strip the first color character if it
--- a/lisp/vc.el Tue Apr 11 22:09:49 2006 +0000 +++ b/lisp/vc.el Tue Apr 11 23:05:31 2006 +0000 @@ -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)