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

[Lars Ingebrigtsen]

Stephen Leake <stephen_leake@stephe-leake.org> writes:

> Richard Copley <rcopley@gmail.com> 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