procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify window-char-pixel-* code slightly

Browse source 
* lisp/window.el (window-char-pixel-width)
(window-char-pixel-height): Simplify code slightly.
This commit is contained in:
Lars Ingebrigtsen 2022-04-29 15:52:21 +02:00
parent 471c4ee4b6
commit e065d08fa7
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/window.el
View file

@ -10488,8 +10488,7 @@ If FACE is nil or omitted, the default face is used. If FACE is
remapped (see `face-remapping-alist'), the function returns the
information for the remapped face."
(with-selected-window (window-normalize-window window t)
(let* ((face (if face face 'default))
(info (font-info (face-font face)))
(let* ((info (font-info (face-font (or face 'default))))
(width (aref info 11)))
(if (> width 0)
width
@ -10503,9 +10502,7 @@ If FACE is nil or omitted, the default face is used. If FACE is
remapped (see `face-remapping-alist'), the function returns the
information for the remapped face."
(with-selected-window (window-normalize-window window t)
(let* ((face (if face face 'default))
(info (font-info (face-font face))))
(aref info 3))))
(aref (font-info (face-font (or face 'default))) 3)))
(defun window-max-characters-per-line (&optional window face)
"Return the number of characters that can be displayed on one line in WINDOW.