[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfns.c,v
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfns.c,v |
Date: |
Tue, 31 Oct 2006 06:41:56 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 06/10/31 06:41:55
Index: xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.678
retrieving revision 1.679
diff -u -b -r1.678 -r1.679
--- xfns.c 21 Oct 2006 01:57:16 -0000 1.678
+++ xfns.c 31 Oct 2006 06:41:55 -0000 1.679
@@ -2134,13 +2134,20 @@
if (!xfs)
{
char *fontsetname = xic_create_fontsetname (base_fontname, False);
- char *p0 = fontsetname, *p1;
/* New fontset. */
+ xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
+ fontsetname, &missing_list,
+ &missing_count, &def_string);
+ if (missing_list)
+ XFreeStringList (missing_list);
+ if (! xfs)
+ {
/* FONTSETNAME contains a list of font names (specific fonts
- first, general fonts last), but giving that to XCreateFontSet
- at once occasionally fails (bug of X?). So, we try to call
- XCreateFontSet for each fontname. */
+ first, general fonts last), but giving that to
+ XCreateFontSet at once occasionally fails (bug of X?).
+ So, we try to call XCreateFontSet for each fontname. */
+ char *p0 = fontsetname, *p1;
while (p0)
{
@@ -2156,6 +2163,7 @@
break;
p0 = p1 ? p1 + 1 : NULL;
}
+ }
xfree (fontsetname);
}