From: Eli Zaretskii <eliz@gnu.org>
To: Boruch Baum <boruch_baum@gmx.com>, martin rudalics <rudalics@gmx.at>
Cc: 48408@debbugs.gnu.org
Subject: bug#48408: BUGFIX: window-default-font-height: check for nil string
Date: Sun, 16 May 2021 11:30:11 +0300 [thread overview]
Message-ID: <83pmxrulm4.fsf@gnu.org> (raw)
In-Reply-To: <20210516065904.5wweuipi23oy5g2x@E15-2016.optimum.net> (message from Boruch Baum on Sun, 16 May 2021 02:59:05 -0400)
> Date: Sun, 16 May 2021 02:59:05 -0400
> From: Boruch Baum <boruch_baum@gmx.com>
>
> 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))))
next prev parent reply other threads:[~2021-05-16 8:30 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-14 1:15 bug#48408: BUGFIX: window-default-font-height: check for nil string Boruch Baum
2021-05-14 6:39 ` Eli Zaretskii
2021-05-16 3:06 ` Boruch Baum
2021-05-16 4:22 ` Eli Zaretskii
2021-05-16 4:42 ` Boruch Baum
2021-05-16 5:25 ` Eli Zaretskii
2021-05-16 6:05 ` Boruch Baum
2021-05-16 6:32 ` Eli Zaretskii
2021-05-16 6:29 ` Eli Zaretskii
[not found] ` <20210516065904.5wweuipi23oy5g2x@E15-2016.optimum.net>
2021-05-16 8:30 ` Eli Zaretskii [this message]
2021-05-16 8:35 ` martin rudalics
2021-05-16 8:56 ` Eli Zaretskii
2021-05-16 9:08 ` Eli Zaretskii
2021-05-16 9:28 ` martin rudalics
2021-05-16 9:36 ` Eli Zaretskii
2021-05-19 4:00 ` Boruch Baum
2021-05-19 7:45 ` martin rudalics
2021-05-19 10:39 ` Boruch Baum
2021-05-19 11:29 ` Eli Zaretskii
2021-05-19 11:55 ` Boruch Baum
2021-05-19 14:17 ` Eli Zaretskii
2021-05-19 16:01 ` Eli Zaretskii
2022-07-12 22:59 ` Lars Ingebrigtsen
2021-05-16 8:31 ` martin rudalics
2021-05-14 7:09 ` martin rudalics
2021-05-14 7:15 ` martin rudalics
2021-05-14 7:26 ` Eli Zaretskii
2021-05-14 8:15 ` martin rudalics
2021-05-14 10:45 ` Eli Zaretskii
2021-05-16 3:11 ` Boruch Baum
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83pmxrulm4.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=48408@debbugs.gnu.org \
--cc=boruch_baum@gmx.com \
--cc=rudalics@gmx.at \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).