613a614,623
> (defcustom vc-diff-do-shrink-window-if-larger-than-buff t
>   "*This variable controls the resizing behavior of the
> window that contains the `*vc-diff*' buffer. If non-nil, then
> the window will shrink to occupy only the required buffer space
> if the contents of the buffer are less than the size of the
> window. If nil, then the size of the window will not change to
> reflect the size of the buffer contents."
>   :type 'boolean
>   :group 'vc)
> 
1795c1805,1806
< 		      (shrink-window-if-larger-than-buffer)))
---
> 		      (and vc-diff-do-shrink-window-if-larger-than-buff
> 			   (shrink-window-if-larger-than-buffer))))