1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-13 06:50:39 -08:00

(x_list_fonts): Don't change the value of maxnames.

This commit is contained in:
Kenichi Handa 1998-11-11 03:36:15 +00:00
parent 8de1edce6a
commit 861bf815f3

View file

@ -6469,12 +6469,6 @@ x_list_fonts (f, pattern, size, maxnames)
if (maxnames == 1 && !size)
/* We can return any single font matching PATTERN. */
try_XLoadQueryFont = 1;
else
{
/* We try at least 10 fonts because XListFonts will return
auto-scaled fonts at the head. */
if (maxnames < 10) maxnames = 10;
}
for (; CONSP (patterns); patterns = XCONS (patterns)->cdr)
{
@ -6535,7 +6529,9 @@ x_list_fonts (f, pattern, size, maxnames)
}
if (!try_XLoadQueryFont)
names = XListFonts (dpy, XSTRING (pattern)->data, maxnames,
/* We try at least 10 fonts because XListFonts will return
auto-scaled fonts at the head. */
names = XListFonts (dpy, XSTRING (pattern)->data, max (maxnames, 10),
&num_fonts);
UNBLOCK_INPUT;