From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stephen Leake Newsgroups: gmane.emacs.bugs Subject: bug#22072: Error in display-startup-screen if create-image fails Date: Wed, 02 Dec 2015 06:36:48 -0600 Message-ID: <86mvttm3hb.fsf@stephe-leake.org> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1449059903 2798 80.91.229.3 (2 Dec 2015 12:38:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 2 Dec 2015 12:38:23 +0000 (UTC) Cc: 22072@debbugs.gnu.org To: Richard Copley Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Dec 02 13:38:11 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 1a46fh-0001jg-1V for geb-bug-gnu-emacs@m.gmane.org; Wed, 02 Dec 2015 13:38:09 +0100 Original-Received: from localhost ([::1]:57784 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a46fg-0001lz-9U for geb-bug-gnu-emacs@m.gmane.org; Wed, 02 Dec 2015 07:38:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50841) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a46fd-0001lo-5U for bug-gnu-emacs@gnu.org; Wed, 02 Dec 2015 07:38:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a46fZ-0005vE-TK for bug-gnu-emacs@gnu.org; Wed, 02 Dec 2015 07:38:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:46042) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a46fZ-0005v9-PI for bug-gnu-emacs@gnu.org; Wed, 02 Dec 2015 07:38:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1a46fZ-0008Ql-M6 for bug-gnu-emacs@gnu.org; Wed, 02 Dec 2015 07:38:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stephen Leake Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 02 Dec 2015 12:38: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.144905982732336 (code B ref 22072); Wed, 02 Dec 2015 12:38:01 +0000 Original-Received: (at 22072) by debbugs.gnu.org; 2 Dec 2015 12:37:07 +0000 Original-Received: from localhost ([127.0.0.1]:35750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1a46eg-0008PU-Qq for submit@debbugs.gnu.org; Wed, 02 Dec 2015 07:37:07 -0500 Original-Received: from gproxy4-pub.mail.unifiedlayer.com ([69.89.23.142]:39675) by debbugs.gnu.org with smtp (Exim 4.80) (envelope-from ) id 1a46ed-0008PL-KG for 22072@debbugs.gnu.org; Wed, 02 Dec 2015 07:37:05 -0500 Original-Received: (qmail 21340 invoked by uid 0); 2 Dec 2015 12:36:57 -0000 Original-Received: from unknown (HELO cmgw3) (10.0.90.84) by gproxy4.mail.unifiedlayer.com with SMTP; 2 Dec 2015 12:36:57 -0000 Original-Received: from host114.hostmonster.com ([74.220.207.114]) by cmgw3 with id ojcr1r00A2UdiVW01jcunY; Wed, 02 Dec 2015 12:36:54 -0700 X-Authority-Analysis: v=2.1 cv=Caqbutbl c=1 sm=1 tr=0 a=CQdxDb2CKd3SRg4I0/XZPQ==:117 a=CQdxDb2CKd3SRg4I0/XZPQ==:17 a=DsvgjBjRAAAA:8 a=f5113yIGAAAA:8 a=9i_RQKNPAAAA:8 a=hEr_IkYJT6EA:10 a=x_XPkuGwIRMA:10 a=wUQvQvOEmiQA:10 a=pGLkceISAAAA:8 a=cwJsGDipi4G-k-tNeckA:9 Original-Received: from [76.218.37.33] (port=58166 helo=TAKVER2) by host114.hostmonster.com with esmtpa (Exim 4.84) (envelope-from ) id 1a46eT-0000yF-IM; Wed, 02 Dec 2015 05:36:53 -0700 In-Reply-To: (Richard Copley's message of "Wed, 2 Dec 2015 01:53:38 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (windows-nt) X-Identified-User: {2442:host114.hostmonster.com:stephele:stephe-leake.org} {sentby:smtp auth 76.218.37.33 authed with stephen_leake@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:109526 Archived-At: 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