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

; * src/character.c (lisp_string_width): Another defensive fix.

Browse source
This commit is contained in:
Eli Zaretskii 2021-05-27 17:15:53 +03:00
parent 0d0e6143e7
commit f1c3b82d40
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/character.c
View file

@ -394,9 +394,12 @@ lisp_string_width (Lisp_Object string, ptrdiff_t from, ptrdiff_t to,
SBYTES (default_font))))
{
Lisp_Object font_info = Ffont_info (default_font, Qnil);
font_width = XFIXNUM (AREF (font_info, 11));
if (font_width <= 0)
font_width = XFIXNUM (AREF (font_info, 10));
if (VECTORP (font_info))
{
font_width = XFIXNUM (AREF (font_info, 11));
if (font_width <= 0)
font_width = XFIXNUM (AREF (font_info, 10));
}
}
}
thiswidth = (double) pixelwidth / font_width + 0.5;