Mercurial > emacs
changeset 47230:2f4274cc65ea
*** empty log message ***
| author | John Paul Wallington <jpw@pobox.com> |
|---|---|
| date | Thu, 05 Sep 2002 00:19:49 +0000 |
| parents | aad2620d71a8 |
| children | 2d6a05542b5b |
| files | lisp/ChangeLog lisp/startup.el |
| diffstat | 2 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Sep 04 20:54:44 2002 +0000 +++ b/lisp/ChangeLog Thu Sep 05 00:19:49 2002 +0000 @@ -1,3 +1,8 @@ +2002-09-04 John Paul Wallington <jpw@shootybangbang.com> + + * startup.el (use-fancy-splash-screens-p): If `fancy-splash-frame' + returns nil, return nil. + 2002-09-04 Andre Spiegel <spiegel@gnu.org> * vc-hooks.el: Require vc.el at compile-time.
--- a/lisp/startup.el Wed Sep 04 20:54:44 2002 +0000 +++ b/lisp/startup.el Thu Sep 05 00:19:49 2002 +0000 @@ -1322,14 +1322,15 @@ (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 ()