diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/vc.el | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dbc1231354c..b7dcf022996 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/vc.el b/lisp/vc.el index 96d85e7b1e0..19b2f0f4a72 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -886,7 +886,7 @@ However, before executing BODY, find FILE, and after BODY, save buffer." (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 @@ BUFFER. `vc-annotate-display-mode' specifies the highlighting mode to 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) |