# HG changeset patch # User Stefan Monnier # Date 1201183930 0 # Node ID 7145a0db2111c60b3e27e3ed5bf33229b9620f3f # Parent a3528f09f3e9ba7ce1a5c749e75290096357f8b2 (vc-version-diff): Make sure we shrink the right window. diff -r a3528f09f3e9 -r 7145a0db2111 lisp/ChangeLog --- a/lisp/ChangeLog Wed Jan 23 08:01:01 2008 +0000 +++ b/lisp/ChangeLog Thu Jan 24 14:12:10 2008 +0000 @@ -1,3 +1,7 @@ +2008-01-24 Stefan Monnier + + * vc.el (vc-version-diff): Make sure we shrink the right window. + 2008-01-23 Jason Rumney * lpr.el (printer-name): Do not set on MS Windows. diff -r a3528f09f3e9 -r 7145a0db2111 lisp/vc.el --- a/lisp/vc.el Wed Jan 23 08:01:01 2008 +0000 +++ b/lisp/vc.el Thu Jan 24 14:12:10 2008 +0000 @@ -1853,7 +1853,8 @@ (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)