From: Richard Copley <rcopley@gmail.com>
To: Stephen Leake <stephen_leake@stephe-leake.org>
Cc: 22072@debbugs.gnu.org
Subject: bug#22072: Error in display-startup-screen if create-image fails
Date: Wed, 2 Dec 2015 20:07:01 +0000 [thread overview]
Message-ID: <CAPM58ojN8j_0f9VHLvjpdWok20uSw_G7Y44Ykn4YLX9BeVCopw@mail.gmail.com> (raw)
In-Reply-To: <86mvttm3hb.fsf@stephe-leake.org>
Thanks Stephen. More haste, less speed ... you shouldn't have changed
"let*" to "let" and the parentheses don't match. After fixing those
things, yes, doing as you suggest allows my broken Emacs to start
without the fancy image and without error.
On 2 December 2015 at 12:36, Stephen Leake
<stephen_leake@stephe-leake.org> wrote:
> Richard Copley <rcopley@gmail.com> writes:
>
> Can you test this patch:
>
> diff --git a/lisp/startup.el b/lisp/startup.el
> index 1346310..a281f86 100644
> --- a/lisp/startup.el
> +++ b/lisp/startup.el
> @@ -1874,13 +1874,13 @@ 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 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))))))))
>
> --
> -- Stephe
next prev parent reply other threads:[~2015-12-02 20:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-02 1:53 bug#22072: Error in display-startup-screen if create-image fails Richard Copley
2015-12-02 12:36 ` Stephen Leake
2015-12-02 20:07 ` Richard Copley [this message]
2019-09-26 16:27 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPM58ojN8j_0f9VHLvjpdWok20uSw_G7Y44Ykn4YLX9BeVCopw@mail.gmail.com \
--to=rcopley@gmail.com \
--cc=22072@debbugs.gnu.org \
--cc=stephen_leake@stephe-leake.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.