From: Richard M. Stallman Date: Thu, 14 Dec 2006 15:16:52 +0000 (+0000) Subject: (use-fancy-splash-screens-p): Use frame-height X-Git-Tag: emacs-pretest-22.0.92~128 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a68ccb40d6d0d89ef65d9e5e80b0c393fe29d6c2;p=emacs.git (use-fancy-splash-screens-p): Use frame-height instead of window-height. Pass frame to image-size. --- diff --git a/lisp/startup.el b/lisp/startup.el index 2573d0790ea..8d1c254d7a1 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1451,9 +1451,12 @@ we put it on this frame." (if (and (display-color-p) (image-type-available-p 'xpm)) "splash.xpm" "splash.pbm")))) - (image-height (and img (cdr (image-size img)))) - (window-height (1- (window-height (frame-selected-window frame))))) - (> window-height (+ image-height 19))))))) + (image-height (and img (cdr (image-size img nil frame)))) + ;; We test frame-height so that, if the frame is split + ;; by displaying a warning, that doesn't cause the normal + ;; splash screen to be used. + (frame-height (1- (frame-height frame)))) + (> frame-height (+ image-height 19))))))) (defun normal-splash-screen (&optional hide-on-input)