>     ! 	      && (window_height (window) >=
 >     ! 		  window_min_size_2 (XWINDOW (window), 0) << 1))
 >
 > Please break the line before the >= operator, not after.

Done.  I also replaced shifting by multiplication as proposed by David
(there are still two ">>" left in `split-window').  Moreover, I now do
the check in `display-buffer' for the largest _and_ the LRU window.

Finally, I do not reset `split-height-threshold' any more when it is
less than `window-min-height'.  Otherwise, binding `window-min-height'
temporarily to a larger value may break a user's customizations of
`split-height-threshold' due to the following assignment in
`display-buffer':

       if (split_height_threshold < window_min_height << 1)
	split_height_threshold = window_min_height << 1;