diff options
| author | John Paul Wallington <jpw@pobox.com> | 2002-09-05 00:19:49 +0000 |
|---|---|---|
| committer | John Paul Wallington <jpw@pobox.com> | 2002-09-05 00:19:49 +0000 |
| commit | 16d2fae910f2a7684d81aae6bb457923ec0d969a (patch) | |
| tree | 37fa8f9923007c52cfc6be58845e725d9f347f84 /lisp/startup.el | |
| parent | 6a66dca96b5b5119dd83b5ff239176ff46ac7a2d (diff) | |
| download | emacs-16d2fae910f2a7684d81aae6bb457923ec0d969a.tar.gz | |
*** empty log message ***
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 8afdb8c92f0..bff7e09e4fe 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1322,14 +1322,15 @@ we put it on this frame." (when (or (and (display-color-p) (image-type-available-p 'xpm)) (image-type-available-p 'pbm)) - (let* ((frame (fancy-splash-frame)) - (img (create-image (or fancy-splash-image - (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))))) + (let ((frame (fancy-splash-frame))) + (when frame + (let* ((img (create-image (or fancy-splash-image + (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))))))) (defun normal-splash-screen () |