diff options
| author | Stefan Monnier <[email protected]> | 2006-04-11 23:05:31 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2006-04-11 23:05:31 +0000 |
| commit | 8a8f8697fe793055cf10c6081de7c5675151ed1e (patch) | |
| tree | 2891a025be3516bbe53d86a130ca3ef3e2e90d86 /lisp/vc.el | |
| parent | 21bc768b9b693f97940c56b9f4e80b9a7f486e34 (diff) | |
(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.
Diffstat (limited to 'lisp/vc.el')
| -rw-r--r-- | lisp/vc.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 96d85e7b1e..19b2f0f4a7 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) |