(vc-version-diff): Make sure we shrink the right window.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28d0cc19003685df29c01ac02a9d7ecb258851f4..a4c7feae80d101c8706acecca6b8bfea492abdd7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * vc.el (vc-version-diff): Make sure we shrink the right window.
+
 2008-01-23  Jason Rumney  <jasonr@gnu.org>
 
        * lpr.el (printer-name): Do not set on MS Windows.

diff --git a/lisp/vc.el b/lisp/vc.el
index bbca76e2b90ddac5dfb3a64ad4aff991ed913859..e7fc52b5019001394c2a024b42eb91e9d127ba83 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1853,7 +1853,8 @@ versions of all registered files in or below it."
                      (if (eq (buffer-size) 0)
                          (insert "No differences found.\n"))
                      (goto-char (point-min))
-                     (shrink-window-if-larger-than-buffer)))
+                      (let ((win (get-buffer-window (current-buffer) t)))
+                        (if win (shrink-window-if-larger-than-buffer win)))))
     t))
 
 (defun vc-diff-label (file file-rev rev)