Mercurial > emacs
changeset 35371:dc0d772c9d3d
(x_face_list_fonts): Don't BLOCK_INPUT around the
call to x_list_fonts. Call x_list_fonts with SIZE -1 only
if SCALABLE_FONTS_P is set.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Wed, 17 Jan 2001 15:55:49 +0000 |
| parents | bbca4b18a59c |
| children | 7c46b0378534 |
| files | src/xfaces.c |
| diffstat | 1 files changed, 4 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfaces.c Wed Jan 17 15:51:32 2001 +0000 +++ b/src/xfaces.c Wed Jan 17 15:55:49 2001 +0000 @@ -2281,12 +2281,7 @@ For all fonts found, set FONTS[i].name to the name of the font, allocated via xmalloc, and split font names into fields. Ignore - fonts that we can't parse. Value is the number of fonts found. - - This is similar to x_list_fonts. The differences are: - - 1. It avoids consing. - 2. It never calls XLoadQueryFont. */ + fonts that we can't parse. Value is the number of fonts found. */ static int x_face_list_fonts (f, pattern, fonts, nfonts, try_alternatives_p, @@ -2307,13 +2302,13 @@ lpattern = build_string (pattern); /* Get the list of fonts matching PATTERN. */ +#ifdef WINDOWSNT BLOCK_INPUT; -#ifdef WINDOWSNT lfonts = w32_list_fonts (f, lpattern, 0, nfonts); + UNBLOCK_INPUT; #else - lfonts = x_list_fonts (f, lpattern, -1, nfonts); + lfonts = x_list_fonts (f, lpattern, scalable_fonts_p ? -1 : 0, nfonts); #endif - UNBLOCK_INPUT; /* Make a copy of the font names we got from X, and split them into fields. */