[Emacs-diffs] Changes to emacs/src/xfns.c

[Jan Djärv]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.616 emacs/src/xfns.c:1.617
*** emacs/src/xfns.c:1.616      Thu Oct 21 18:38:57 2004
--- emacs/src/xfns.c    Fri Oct 22 12:56:09 2004
***************
*** 1949,1955 ****
       char *base_fontname;
  {
    XFontSet xfs = NULL;
!   char **missing_list;
    int missing_count;
    char *def_string;
    Lisp_Object rest, frame;
--- 1949,1955 ----
       char *base_fontname;
  {
    XFontSet xfs = NULL;
!   char **missing_list = NULL;
    int missing_count;
    char *def_string;
    Lisp_Object rest, frame;
***************
*** 1968,1979 ****
      }
  
    if (!xfs)
!     /* New fontset.  */
!     xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
!                           base_fontname, &missing_list,
!                           &missing_count, &def_string);
!   if (missing_list)
!     XFreeStringList (missing_list);
  
    if (FRAME_XIC_BASE_FONTNAME (f))
      xfree (FRAME_XIC_BASE_FONTNAME (f));
--- 1968,1981 ----
      }
  
    if (!xfs)
!     {
!       /* New fontset.  */
!       xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
!                             base_fontname, &missing_list,
!                             &missing_count, &def_string);
!       if (missing_list)
!         XFreeStringList (missing_list);
!     }
  
    if (FRAME_XIC_BASE_FONTNAME (f))
      xfree (FRAME_XIC_BASE_FONTNAME (f));