*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 35f0ac27542c5f92d0301010277380f75bc111ec..190ee238f0aa47d8ae428410bfa87974b7da1fe5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/startup.el b/lisp/startup.el
index 8afdb8c92f02c225bd0fabc3b750635e90dbf2a0..bff7e09e4fecc677ae025dd247258768ecb6e362 100644 (file)
--- 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 ()