Mercurial > emacs
changeset 74614:fca3bf689dc4
(use-fancy-splash-screens-p): Use frame-height
instead of window-height. Pass frame to image-size.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Thu, 14 Dec 2006 15:16:52 +0000 |
| parents | a034e88d18ff |
| children | ac990ee1126d |
| files | lisp/startup.el |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Thu Dec 14 08:42:28 2006 +0000 +++ b/lisp/startup.el Thu Dec 14 15:16:52 2006 +0000 @@ -1451,9 +1451,12 @@ (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)