comparison src/xfns.c @ 90662:a81dd6ff9caa

(xic_create_xfontset): Try the default fontset name as a last resort.
author Kenichi Handa <handa@m17n.org>
date Fri, 17 Nov 2006 10:57:12 +0000
parents 02cf29720f31
children 42871c3ee387
comparison
equal deleted inserted replaced
90661:486295710f09 90662:a81dd6ff9caa
2149 break; 2149 break;
2150 p0 = p1 ? p1 + 1 : NULL; 2150 p0 = p1 ? p1 + 1 : NULL;
2151 } 2151 }
2152 } 2152 }
2153 xfree (fontsetname); 2153 xfree (fontsetname);
2154 if (! xfs && base_fontname != xic_defaut_fontset)
2155 {
2156 /* Try the default fontset name at a last resort. */
2157 fontsetname = xic_create_fontsetname (xic_defaut_fontset, False);
2158 xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
2159 fontsetname, &missing_list,
2160 &missing_count, &def_string);
2161 if (missing_list)
2162 XFreeStringList (missing_list);
2163 xfree (fontsetname);
2164 }
2154 } 2165 }
2155 2166
2156 if (FRAME_XIC_BASE_FONTNAME (f)) 2167 if (FRAME_XIC_BASE_FONTNAME (f))
2157 xfree (FRAME_XIC_BASE_FONTNAME (f)); 2168 xfree (FRAME_XIC_BASE_FONTNAME (f));
2158 FRAME_XIC_BASE_FONTNAME (f) = xstrdup (base_fontname); 2169 FRAME_XIC_BASE_FONTNAME (f) = xstrdup (base_fontname);