From: Gerd Moellmann Date: Wed, 17 Jan 2001 15:56:25 +0000 (+0000) Subject: (x_face_list_fonts): Don't BLOCK_INPUT around the X-Git-Tag: emacs-pretest-21.0.96~239 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a86110a8e3be545fd163ed1d9f7fa08cffa1a616;p=emacs.git (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. --- diff --git a/src/ChangeLog b/src/ChangeLog index 01f3772db32..107cba684d3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2001-01-17 Gerd Moellmann + * xfaces.c (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. + * xfaces.c (x_face_list_fonts): Call x_list_fonts with SIZE -1, so that scalable fonts are included. diff --git a/src/xfaces.c b/src/xfaces.c index 2275a928ecf..51cb455e95a 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -2281,12 +2281,7 @@ sort_fonts (f, fonts, nfonts, cmpfn) 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 @@ x_face_list_fonts (f, pattern, fonts, nfonts, try_alternatives_p, lpattern = build_string (pattern); /* Get the list of fonts matching PATTERN. */ - BLOCK_INPUT; #ifdef WINDOWSNT + BLOCK_INPUT; 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. */