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

[Miles Bader]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.590.2.9 emacs/src/xfns.c:1.590.2.10
*** emacs/src/xfns.c:1.590.2.9  Fri Oct 22 10:13:35 2004
--- emacs/src/xfns.c    Wed Oct 27 05:42:01 2004
***************
*** 1929,1935 ****
       char *base_fontname;
  {
    XFontSet xfs = NULL;
!   char **missing_list;
    int missing_count;
    char *def_string;
    Lisp_Object rest, frame;
--- 1929,1935 ----
       char *base_fontname;
  {
    XFontSet xfs = NULL;
!   char **missing_list = NULL;
    int missing_count;
    char *def_string;
    Lisp_Object rest, frame;
***************
*** 1940,1945 ****
--- 1940,1946 ----
        struct frame *cf = XFRAME (frame);
        if (cf != f && FRAME_LIVE_P (f) && FRAME_X_P (cf)
            && FRAME_X_DISPLAY_INFO (cf) == FRAME_X_DISPLAY_INFO (f)
+           && FRAME_XIC_BASE_FONTNAME (cf)
            && !strcmp (FRAME_XIC_BASE_FONTNAME (cf), base_fontname))
          {
            xfs = FRAME_XIC_FONTSET (cf);
***************
*** 1948,1959 ****
      }
  
    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));
--- 1949,1962 ----
      }
  
    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));