Fix error in display-startup-screen

* lisp/startup.el (use-fancy-splash-screens-p): Fix error in
display-startup-screen if create-image fails (bug#22072).

diff --git a/lisp/startup.el b/lisp/startup.el
index 4078f23f3a85ca84110fddf9471837e381e2a713..6e2094d678c351871c615f3f930a7bb52f71b959 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1974,16 +1974,16 @@ we put it on this frame."
                  (image-type-available-p 'pbm)))
     (let ((frame (fancy-splash-frame)))
       (when frame
-       (let* ((img (create-image (fancy-splash-image-file)))
-              (image-height (and img (cdr (image-size img nil frame))))
-              ;; We test frame-height and not window-height so that,
-              ;; if the frame is split by displaying a warning, that
-              ;; doesn't cause the normal splash screen to be used.
-              ;; We subtract 2 from frame-height to account for the
-              ;; echo area and the mode line.
-              (frame-height (- (frame-height frame) 2)))
-         (> frame-height (+ image-height 19)))))))
-
+       (let ((img (create-image (fancy-splash-image-file))))
+          (when img
+            (let ((image-height (cdr (image-size img nil frame)))
+                 ;; We test frame-height and not window-height so that,
+                 ;; if the frame is split by displaying a warning, that
+                 ;; doesn't cause the normal splash screen to be used.
+                 ;; We subtract 2 from frame-height to account for the
+                 ;; echo area and the mode line.
+                 (frame-height (- (frame-height frame) 2)))
+             (> frame-height (+ image-height 19)))))))))
 
 (defun normal-splash-screen (&optional startup concise)
   "Display non-graphic splash screen.