andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix error during startup in -nw sessions

Browse source 
* lisp/startup.el (normal-top-level, command-line-1): Don't mess
with fonts in a text-mode session.  (Bug#56660)
This commit is contained in:
Eli Zaretskii 2022-07-20 14:57:15 +03:00
parent b70a00d9bf
commit 4582e356d1
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/startup.el
View file

@ -802,7 +802,8 @@ It is the default value of the variable `top-level'."
;; objects and regenerate them; currently we do not. As a
;; workaround, we specifically reset the default face's :font
;; attribute here, if it was rescaled. See bug#1785.
(when (and (not (eq face-font-rescale-alist
(when (and (display-multi-font-p)
(not (eq face-font-rescale-alist
old-face-font-rescale-alist))
(assoc (font-xlfd-name (face-attribute 'default :font))
face-font-rescale-alist #'string-match-p))
@ -2845,7 +2846,8 @@ nil default-directory" name)
;; See the commentary in `normal-top-level' for why we do
;; this.
(when (and (not (eq face-font-rescale-alist
(when (and (display-multi-font-p)
(not (eq face-font-rescale-alist
old-face-font-rescale-alist))
(assoc (font-xlfd-name (face-attribute 'default :font))
face-font-rescale-alist #'string-match-p))