*** empty log message ***

2 files changed, 14 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 35f0ac27542..190ee238f0a 100644
--- 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 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 ()