Mercurial > emacs

comparison src/xfns.c @ 83548:c71725faff1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned! Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-490 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-491 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-492 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-493 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-494 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-495 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-496 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-497 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-498 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-499 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-500 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-501 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-502 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-503 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-504 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-505 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-506 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-507 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-508 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-509 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-510 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-511 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-512 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-513 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-514 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-515 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-516 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-517 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-518 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-519 Update from CVS: etc/TUTORIAL.cn: Updated. * emacs@sv.gnu.org/emacs--devo--0--patch-520 Merge from erc--emacs--22 * emacs@sv.gnu.org/emacs--devo--0--patch-521 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-522 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-523 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-524 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-525 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-526 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-527 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-528 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-529 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-530 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-531 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-532 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-533 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-534 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-535 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-161 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-162 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-163 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-164 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-165 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-166 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-167 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-168 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-169 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-170 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-588
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 03 Dec 2006 15:03:30 +0000
parents 034f67f59091 0cc0a8049941
children b8d9a391daf3
comparison
equal deleted inserted replaced
83547:0912b745fc75 83548:c71725faff1a
2141 } 2141 }
2142 2142
2143 if (!xfs) 2143 if (!xfs)
2144 { 2144 {
2145 char *fontsetname = xic_create_fontsetname (base_fontname, False); 2145 char *fontsetname = xic_create_fontsetname (base_fontname, False);
2146 char *p0 = fontsetname, *p1;
2147 2146
2148 /* New fontset. */ 2147 /* New fontset. */
2149 /* FONTSETNAME contains a list of font names (specific fonts 2148 xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
2150 first, general fonts last), but giving that to XCreateFontSet 2149 fontsetname, &missing_list,
2151 at once occasionally fails (bug of X?). So, we try to call 2150 &missing_count, &def_string);
2152 XCreateFontSet for each fontname. */ 2151 if (missing_list)
2153 2152 XFreeStringList (missing_list);
2154 while (p0) 2153 if (! xfs)
2155 { 2154 {
2156 p1 = strchr (p0, ','); 2155 /* FONTSETNAME contains a list of font names (specific fonts
2157 if (p1) 2156 first, general fonts last), but giving that to
2158 *p1 = '\0'; 2157 XCreateFontSet at once occasionally fails (bug of X?).
2159 xfs = XCreateFontSet (FRAME_X_DISPLAY (f), 2158 So, we try to call XCreateFontSet for each fontname. */
2160 p0, &missing_list, 2159 char *p0 = fontsetname, *p1;
2161 &missing_count, &def_string); 2160
2162 if (missing_list) 2161 while (p0)
2163 XFreeStringList (missing_list); 2162 {
2164 if (xfs) 2163 p1 = strchr (p0, ',');
2165 break; 2164 if (p1)
2166 p0 = p1 ? p1 + 1 : NULL; 2165 *p1 = '\0';
2166 xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
2167 p0, &missing_list,
2168 &missing_count, &def_string);
2169 if (missing_list)
2170 XFreeStringList (missing_list);
2171 if (xfs)
2172 break;
2173 p0 = p1 ? p1 + 1 : NULL;
2174 }
2167 } 2175 }
2168 xfree (fontsetname); 2176 xfree (fontsetname);
2169 } 2177 }
2170 2178
2171 if (FRAME_XIC_BASE_FONTNAME (f)) 2179 if (FRAME_XIC_BASE_FONTNAME (f))