From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Copley Newsgroups: gmane.emacs.bugs Subject: bug#22072: Error in display-startup-screen if create-image fails Date: Wed, 2 Dec 2015 20:07:01 +0000 Message-ID: References: <86mvttm3hb.fsf@stephe-leake.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1449086901 8762 80.91.229.3 (2 Dec 2015 20:08:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 2 Dec 2015 20:08:21 +0000 (UTC) Cc: 22072@debbugs.gnu.org To: Stephen Leake Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Dec 02 21:08:12 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1a4DhC-0001wO-EV for geb-bug-gnu-emacs@m.gmane.org; Wed, 02 Dec 2015 21:08:10 +0100 Original-Received: from localhost ([::1]:60150 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4DhB-0005BM-R2 for geb-bug-gnu-emacs@m.gmane.org; Wed, 02 Dec 2015 15:08:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Dh8-0005B6-BW for bug-gnu-emacs@gnu.org; Wed, 02 Dec 2015 15:08:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4Dh4-0007s8-6h for bug-gnu-emacs@gnu.org; Wed, 02 Dec 2015 15:08:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:46890) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Dh4-0007s4-3D for bug-gnu-emacs@gnu.org; Wed, 02 Dec 2015 15:08:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1a4Dh3-0007wa-No for bug-gnu-emacs@gnu.org; Wed, 02 Dec 2015 15:08:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Richard Copley Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 02 Dec 2015 20:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22072 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 22072-submit@debbugs.gnu.org id=B22072.144908682530473 (code B ref 22072); Wed, 02 Dec 2015 20:08:01 +0000 Original-Received: (at 22072) by debbugs.gnu.org; 2 Dec 2015 20:07:05 +0000 Original-Received: from localhost ([127.0.0.1]:36598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1a4Dg9-0007vR-08 for submit@debbugs.gnu.org; Wed, 02 Dec 2015 15:07:05 -0500 Original-Received: from mail-yk0-f170.google.com ([209.85.160.170]:33526) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1a4Dg6-0007vI-Dp for 22072@debbugs.gnu.org; Wed, 02 Dec 2015 15:07:03 -0500 Original-Received: by ykdv3 with SMTP id v3so60475424ykd.0 for <22072@debbugs.gnu.org>; Wed, 02 Dec 2015 12:07:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=wOk3ndjH7EBWlYwm3zsuAKnhIFu8bkVAzlZBpts607k=; b=H+nzxD4m8KA7wvvrfFVJPeyMFMhi6cyCPGjbt1o4+55sHWU5k73jkazteigUe+cKek QHFDCg6vHCv+LvcXgcuGqFlfZe7xn8u9cfVEnCt7EOY5sqLQKGgsUJKSmcmy1d+r4lkZ 8e/MXNkSOkuWcTqhDC5OagznvuQrsQZEh/ghfL1oe4poxHLc8bYg8m43MVqqUvqpmJpT iHVgRbtI55q6FdRIOwV8PQV1ubK2hoqUEaFOpIIHxEP14SUseM6uCvd5V4NZYUy71rvY 3Oz355j2OvZ+IbQOnR8FVoyykhDmhWZoG1E50ig9zBpARtJgdmAB/Jn7ehk+MmjITPPQ mtBw== X-Received: by 10.13.219.85 with SMTP id d82mr3728560ywe.136.1449086821868; Wed, 02 Dec 2015 12:07:01 -0800 (PST) Original-Received: by 10.37.195.129 with HTTP; Wed, 2 Dec 2015 12:07:01 -0800 (PST) In-Reply-To: <86mvttm3hb.fsf@stephe-leake.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:109539 Archived-At: 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 wrote: > Richard Copley 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