From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#22072: Error in display-startup-screen if create-image fails Date: Thu, 26 Sep 2019 18:27:51 +0200 Message-ID: <87d0fnowe0.fsf@gnus.org> References: <86mvttm3hb.fsf@stephe-leake.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="182476"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: Richard Copley , 22072@debbugs.gnu.org To: Stephen Leake Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Sep 26 18:43:19 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iDWrO-000lKH-9x for geb-bug-gnu-emacs@m.gmane.org; Thu, 26 Sep 2019 18:43:18 +0200 Original-Received: from localhost ([::1]:40896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDWrM-0001nQ-94 for geb-bug-gnu-emacs@m.gmane.org; Thu, 26 Sep 2019 12:43:16 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41617) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDWce-0003Cr-8V for bug-gnu-emacs@gnu.org; Thu, 26 Sep 2019 12:28:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDWcd-00055O-0I for bug-gnu-emacs@gnu.org; Thu, 26 Sep 2019 12:28:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:35682) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iDWcc-00054P-UY for bug-gnu-emacs@gnu.org; Thu, 26 Sep 2019 12:28:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iDWcb-00041T-RP for bug-gnu-emacs@gnu.org; Thu, 26 Sep 2019 12:28:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 26 Sep 2019 16:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22072 X-GNU-PR-Package: emacs Original-Received: via spool by 22072-submit@debbugs.gnu.org id=B22072.156951527715439 (code B ref 22072); Thu, 26 Sep 2019 16:28:01 +0000 Original-Received: (at 22072) by debbugs.gnu.org; 26 Sep 2019 16:27:57 +0000 Original-Received: from localhost ([127.0.0.1]:44500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iDWcX-00040x-AI for submit@debbugs.gnu.org; Thu, 26 Sep 2019 12:27:57 -0400 Original-Received: from quimby.gnus.org ([80.91.231.51]:35566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iDWcV-00040p-Sg for 22072@debbugs.gnu.org; Thu, 26 Sep 2019 12:27:56 -0400 Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=marnie) by quimby.gnus.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iDWcR-000571-Kh; Thu, 26 Sep 2019 18:27:54 +0200 In-Reply-To: <86mvttm3hb.fsf@stephe-leake.org> (Stephen Leake's message of "Wed, 02 Dec 2015 06:36:48 -0600") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.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" Xref: news.gmane.org gmane.emacs.bugs:167277 Archived-At: Stephen Leake writes: > Richard Copley 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