diff options
| -rw-r--r-- | lisp/startup.el | 9 |
1 files changed, 6 insertions, 3 deletions
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." | |||
| 1451 | (if (and (display-color-p) | 1451 | (if (and (display-color-p) |
| 1452 | (image-type-available-p 'xpm)) | 1452 | (image-type-available-p 'xpm)) |
| 1453 | "splash.xpm" "splash.pbm")))) | 1453 | "splash.xpm" "splash.pbm")))) |
| 1454 | (image-height (and img (cdr (image-size img)))) | 1454 | (image-height (and img (cdr (image-size img nil frame)))) |
| 1455 | (window-height (1- (window-height (frame-selected-window frame))))) | 1455 | ;; We test frame-height so that, if the frame is split |
| 1456 | (> window-height (+ image-height 19))))))) | 1456 | ;; by displaying a warning, that doesn't cause the normal |
| 1457 | ;; splash screen to be used. | ||
| 1458 | (frame-height (1- (frame-height frame)))) | ||
| 1459 | (> frame-height (+ image-height 19))))))) | ||
| 1457 | 1460 | ||
| 1458 | 1461 | ||
| 1459 | (defun normal-splash-screen (&optional hide-on-input) | 1462 | (defun normal-splash-screen (&optional hide-on-input) |