diff options
| author | Kenichi Handa | 2006-12-07 12:24:59 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-12-07 12:24:59 +0000 |
| commit | 22a8f595c3588de95508595c0326c44382da1840 (patch) | |
| tree | 0cc22e3964b6d6930026053e40e97362cc62f079 /src | |
| parent | a45d1e2f8ca236e952d17aef21ee0e701f71013e (diff) | |
| download | emacs-22a8f595c3588de95508595c0326c44382da1840.tar.gz emacs-22a8f595c3588de95508595c0326c44382da1840.zip | |
Fix previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/xfns.c b/src/xfns.c index 19ac0bb8ff8..0e9d4e60e90 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -2177,14 +2177,24 @@ xic_create_xfontset (f, base_fontname) | |||
| 2177 | 2177 | ||
| 2178 | #ifdef DEBUG_XIC_FONTSET | 2178 | #ifdef DEBUG_XIC_FONTSET |
| 2179 | static void | 2179 | static void |
| 2180 | print_fontset_result (xfs, name) | 2180 | print_fontset_result (xfs, name, missing_list, missing_count) |
| 2181 | XFontSet xfs; | 2181 | XFontSet xfs; |
| 2182 | char *name; | 2182 | char *name; |
| 2183 | char **missing_list; | ||
| 2184 | int missing_count; | ||
| 2183 | { | 2185 | { |
| 2184 | if (xfs) | 2186 | if (xfs) |
| 2185 | fprintf (stderr, "XIC Fontset created: %s\n", name); | 2187 | fprintf (stderr, "XIC Fontset created: %s\n", name); |
| 2186 | else | 2188 | else |
| 2187 | fprintf (stderr, "XIC Fontset failed: %s\n", name); | 2189 | { |
| 2190 | fprintf (stderr, "XIC Fontset failed: %s\n", name); | ||
| 2191 | while (missing_count-- > 0) | ||
| 2192 | { | ||
| 2193 | fprintf (stderr, " missing: %s\n", *missing_list); | ||
| 2194 | missing_list++; | ||
| 2195 | } | ||
| 2196 | } | ||
| 2197 | |||
| 2188 | } | 2198 | } |
| 2189 | #endif | 2199 | #endif |
| 2190 | 2200 | ||
| @@ -2226,7 +2236,7 @@ xic_create_xfontset2 (f) | |||
| 2226 | xfs = XCreateFontSet (FRAME_X_DISPLAY (f), buf, | 2236 | xfs = XCreateFontSet (FRAME_X_DISPLAY (f), buf, |
| 2227 | &missing_list, &missing_count, &def_string); | 2237 | &missing_list, &missing_count, &def_string); |
| 2228 | #ifdef DEBUG_XIC_FONTSET | 2238 | #ifdef DEBUG_XIC_FONTSET |
| 2229 | print_fontset_result (xfs, buf); | 2239 | print_fontset_result (xfs, buf, missing_list, missing_count); |
| 2230 | #endif | 2240 | #endif |
| 2231 | if (missing_list) | 2241 | if (missing_list) |
| 2232 | XFreeStringList (missing_list); | 2242 | XFreeStringList (missing_list); |
| @@ -2260,7 +2270,7 @@ xic_create_xfontset2 (f) | |||
| 2260 | xfs = XCreateFontSet (FRAME_X_DISPLAY (f), buf, | 2270 | xfs = XCreateFontSet (FRAME_X_DISPLAY (f), buf, |
| 2261 | &missing_list, &missing_count, &def_string); | 2271 | &missing_list, &missing_count, &def_string); |
| 2262 | #ifdef DEBUG_XIC_FONTSET | 2272 | #ifdef DEBUG_XIC_FONTSET |
| 2263 | print_fontset_result (xfs, buf); | 2273 | print_fontset_result (xfs, buf, missing_list, missing_count); |
| 2264 | #endif | 2274 | #endif |
| 2265 | if (missing_list) | 2275 | if (missing_list) |
| 2266 | XFreeStringList (missing_list); | 2276 | XFreeStringList (missing_list); |