From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#48408: BUGFIX: window-default-font-height: check for nil string Date: Sun, 16 May 2021 11:30:11 +0300 Message-ID: <83pmxrulm4.fsf@gnu.org> References: <20210514011519.vsy5jbhyxd4v6kpt@E15-2016.optimum.net> <83mtsxzund.fsf@gnu.org> <20210516030618.7caj6icukblavhbp@E15-2016.optimum.net> <835yzjwbnj.fsf@gnu.org> <20210516044215.23yd5ae3yeby6kaq@E15-2016.optimum.net> <83zgwvuu5z.fsf@gnu.org> <83tun3ur7h.fsf@gnu.org> <20210516065904.5wweuipi23oy5g2x@E15-2016.optimum.net> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29990"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 48408@debbugs.gnu.org To: Boruch Baum , martin rudalics Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun May 16 10:33:12 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1liCD2-0007Yb-PX for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 16 May 2021 10:33:12 +0200 Original-Received: from localhost ([::1]:47750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liCD1-0007PS-Mh for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 16 May 2021 04:33:11 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:58286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liCAx-0002oe-CQ for bug-gnu-emacs@gnu.org; Sun, 16 May 2021 04:31:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:38114) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1liCAx-0000WX-3b for bug-gnu-emacs@gnu.org; Sun, 16 May 2021 04:31:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1liCAw-0001d4-Vy for bug-gnu-emacs@gnu.org; Sun, 16 May 2021 04:31:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 16 May 2021 08:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48408 X-GNU-PR-Package: emacs Original-Received: via spool by 48408-submit@debbugs.gnu.org id=B48408.16211538206170 (code B ref 48408); Sun, 16 May 2021 08:31:02 +0000 Original-Received: (at 48408) by debbugs.gnu.org; 16 May 2021 08:30:20 +0000 Original-Received: from localhost ([127.0.0.1]:49649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1liCAG-0001bS-E5 for submit@debbugs.gnu.org; Sun, 16 May 2021 04:30:20 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:36190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1liCAE-0001bA-Kh for 48408@debbugs.gnu.org; Sun, 16 May 2021 04:30:19 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:44408) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liCA9-0008SQ-6S; Sun, 16 May 2021 04:30:13 -0400 Original-Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:2523 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1liCA8-00039X-OB; Sun, 16 May 2021 04:30:13 -0400 In-Reply-To: <20210516065904.5wweuipi23oy5g2x@E15-2016.optimum.net> (message from Boruch Baum on Sun, 16 May 2021 02:59:05 -0400) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:206641 Archived-At: > Date: Sun, 16 May 2021 02:59:05 -0400 > From: Boruch Baum > > On 2021-05-16 09:29, Eli Zaretskii wrote: > > Boruch, can you try the patch below? > > The hunks don't patch cleanly, but I can try doing it > manually ... after yom tov. Chag Sameyach. Which is a Good Thing, because I've changed my mind. Please try the much simpler patch below. Martin, same question about this one. I decided that there's nothing wrong with how we compute frame-type in the display-*-p predicates; it's window-default-font-height that trusts the 'display' frame parameter too much. WDYT? diff --git a/lisp/window.el b/lisp/window.el index 026cde5..4b99b77 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -8786,7 +8786,11 @@ window-default-font-height (let* ((window (window-normalize-window window t)) (frame (window-frame window)) (default-font (face-font 'default frame))) - (if (and (display-multi-font-p (frame-parameter frame 'display)) + ;; Client frames can have the 'display' parameter set like for X + ;; frames, even though they are TTY frames, so make sure we won't + ;; be duped by that up front with 'framep'. + (if (and (not (eq (framep frame) t)) + (display-multi-font-p (frame-parameter frame 'display)) (not (string-equal (frame-parameter frame 'font) default-font))) (aref (font-info default-font frame) 3) (frame-char-height frame))))