/[emacs]/emacs/src/xfns.c
ViewVC logotype

Diff of /emacs/src/xfns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.616 by jhd, Thu Oct 21 18:38:57 2004 UTC revision 1.617 by jhd, Fri Oct 22 12:56:09 2004 UTC
# Line 1949  xic_create_xfontset (f, base_fontname) Line 1949  xic_create_xfontset (f, base_fontname)
1949       char *base_fontname;       char *base_fontname;
1950  {  {
1951    XFontSet xfs = NULL;    XFontSet xfs = NULL;
1952    char **missing_list;    char **missing_list = NULL;
1953    int missing_count;    int missing_count;
1954    char *def_string;    char *def_string;
1955    Lisp_Object rest, frame;    Lisp_Object rest, frame;
# Line 1968  xic_create_xfontset (f, base_fontname) Line 1968  xic_create_xfontset (f, base_fontname)
1968      }      }
1969    
1970    if (!xfs)    if (!xfs)
1971      /* New fontset.  */      {
1972      xfs = XCreateFontSet (FRAME_X_DISPLAY (f),        /* New fontset.  */
1973                            base_fontname, &missing_list,        xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
1974                            &missing_count, &def_string);                              base_fontname, &missing_list,
1975    if (missing_list)                              &missing_count, &def_string);
1976      XFreeStringList (missing_list);        if (missing_list)
1977            XFreeStringList (missing_list);
1978        }
1979    
1980    if (FRAME_XIC_BASE_FONTNAME (f))    if (FRAME_XIC_BASE_FONTNAME (f))
1981      xfree (FRAME_XIC_BASE_FONTNAME (f));      xfree (FRAME_XIC_BASE_FONTNAME (f));

Legend:
Removed from v.1.616  
changed lines
  Added in v.1.617

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26