diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2021-05-19 19:01:07 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2021-05-19 19:01:07 +0300 |
| commit | 171dbe704890a16cb7381afd7461f6138481ade8 (patch) | |
| tree | e600ba1ed203367b82ec14d09bb6a6a676160b9f /lisp | |
| parent | eb9f48bfade95c0e0f23cd192526d7932939bc7a (diff) | |
| download | emacs-171dbe704890a16cb7381afd7461f6138481ade8.tar.gz emacs-171dbe704890a16cb7381afd7461f6138481ade8.tar.bz2 emacs-171dbe704890a16cb7381afd7461f6138481ade8.zip | |
Fix rare failures in 'window-default-font-height'
* lisp/window.el (window-default-font-height): Avoid signaling an
error when a client TTY frame happens to have an X-style 'display'
parameter. (Bug#48408)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/window.el | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/window.el b/lisp/window.el index 1c719480cab..0f94d8a2141 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -8788,7 +8788,11 @@ font on WINDOW's frame." (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)))) |