comparison lisp/window.el @ 31790:c31d17444869

(shrink-window-if-larger-than-buffer): If face `mode-line' has a :box, and we're on a graphical frame, add 1 to the needed window height.

31789:ff5eb810214a

  (interactive)
  (save-selected-window
    (if window
	(select-window window)
      (setq window (selected-window)))
    (let* ((params (frame-parameters))
           (mini (cdr (assq 'minibuffer params)))
           (edges (window-edges)))
      (if (and (< 1 (count-windows))
               (= (window-width) (frame-width))
               (pos-visible-in-window-p (point-min) window)
               (not (eq mini 'only))
               (or (not mini)
                   (< (nth 3 edges) (nth 1 (window-edges mini)))
                   (> (nth 1 edges) (cdr (assq 'menu-bar-lines params)))))
          ;; `count-screen-lines' always works on the current buffer, so
          ;; make sure it is the buffer displayed by WINDOW.
          (let ((text-height (with-current-buffer (window-buffer window)
                               (count-screen-lines)))
                (window-height (window-height)))
	    ;; Don't try to redisplay with the cursor at the end
	    ;; on its own line--that would force a scroll and spoil things.
	    (when (and (eobp) (bolp) (not (bobp)))
	      (forward-char -1))
            (when (> window-height (1+ text-height))

31790:c31d17444869

  (interactive)
  (save-selected-window
    (if window
	(select-window window)
      (setq window (selected-window)))
    (let* ((mini (frame-parameter nil 'minibuffer))
           (edges (window-edges)))
      (if (and (< 1 (count-windows))
               (= (window-width) (frame-width))
               (pos-visible-in-window-p (point-min) window)
               (not (eq mini 'only))
               (or (not mini)
                   (< (nth 3 edges) (nth 1 (window-edges mini)))
                   (> (nth 1 edges) (frame-parameter nil 'menu-bar-lines))))
          ;; `count-screen-lines' always works on the current buffer, so
          ;; make sure it is the buffer displayed by WINDOW.
          (let ((text-height (with-current-buffer (window-buffer window)
                               (count-screen-lines)))
                (window-height (window-height)))
	    ;; This is a workaround that adds 1 line to the window
	    ;; if windows have a 3D mode-line.  What's really needed
	    ;; is to get rid of the line-based computations.  We don't
	    ;; have the infrastructure for doing so, yet.
	    (when (and (display-graphic-p)
		       (face-attribute 'mode-line :box))
	      (setq text-height (1+ text-height)))
	    ;; Don't try to redisplay with the cursor at the end
	    ;; on its own line--that would force a scroll and spoil things.
	    (when (and (eobp) (bolp) (not (bobp)))
	      (forward-char -1))
            (when (> window-height (1+ text-height))