>From e1f5971c81fabac74280f798802b7958a44db08c Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Thu, 28 Jun 2012 23:18:41 +0400 Subject: [PATCH] * vc.el (vc-diff-finish, vc-log-internal-common): Never shrink pre-existing windows --- lisp/vc/vc.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 87e4e1c..697b212 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -1531,7 +1531,7 @@ to override the value of `vc-diff-switches' and `diff-switches'." (message "%s" (cdr messages)))) (diff-setup-whitespace) (goto-char (point-min)) - (when window + (when (and window (not (window-prev-buffers))) (shrink-window-if-larger-than-buffer window))) (when (and messages (not emptyp)) (message "%sdone" (car messages)))))) @@ -2147,7 +2147,8 @@ Not all VC backends support short logs!") (vc-exec-after `(let ((inhibit-read-only t)) (funcall ',setup-buttons-func ',backend ',files ',retval) - (shrink-window-if-larger-than-buffer) + (unless (window-prev-buffers) + (shrink-window-if-larger-than-buffer)) (funcall ',goto-location-func ',backend) (setq vc-sentinel-movepoint (point)) (set-buffer-modified-p nil))))) -- 1.7.10.msysgit.1