Subject: bug#22072: Error in display-startup-screen if create-image fails

From: Lars Ingebrigtsen <[email-masked]>
Date: Thu, 26 Sep 2019 18:27:51 +0200

Stephen Leake <[email-masked]> writes:

> Richard Copley <[email-masked]> writes:
>
> Can you test this patch:

[...]

> -	(let* ((img (create-image (fancy-splash-image-file)))
> -	       (image-height (and img (cdr (image-size img nil frame))))
> -	       ;; We test frame-height so that, if the frame is split
> -	       ;; by displaying a warning, that doesn't cause the normal
> -	       ;; splash screen to be used.
> -	       (frame-height (1- (frame-height frame))))
> -	  (> frame-height (+ image-height 19)))))))
> +	(let ((img (create-image (fancy-splash-image-file))))
> +              (image-height (and img (cdr (image-size img nil frame))))
> +              ;; We test frame-height so that, if the frame is split
> +              ;; by displaying a warning, that doesn't cause the normal
> +              ;; splash screen to be used.
> +              (frame-height (and img (1- (frame-height frame)))))
> +	  (and img (> frame-height (+ image-height 19))))))))

I've now fixed this on the trunk inspired by this patch, but slightly
differently.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no