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

[Stefan Monnier]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.315 emacs/src/xfaces.c:1.316
*** emacs/src/xfaces.c:1.315    Thu Mar 17 18:43:47 2005
--- emacs/src/xfaces.c  Fri Mar 18 04:21:17 2005
***************
*** 4692,4704 ****
        {
  #ifdef USE_MOTIF
          const char *suffix = "List";
  #else
          const char *suffix = "";
  #endif
! #if defined HAVE_X_I18N && defined USE_MOTIF
          extern char *xic_create_fontsetname
            P_ ((char *base_fontname, Bool motif));
!         char *fontsetname = xic_create_fontsetname (face->font_name, True);
  #else
          char *fontsetname = face->font_name;
  #endif
--- 4692,4706 ----
        {
  #ifdef USE_MOTIF
          const char *suffix = "List";
+         Bool motif = True;
  #else
          const char *suffix = "";
+         Bool motif = False;
  #endif
! #if defined HAVE_X_I18N
          extern char *xic_create_fontsetname
            P_ ((char *base_fontname, Bool motif));
!         char *fontsetname = xic_create_fontsetname (face->font_name, motif);
  #else
          char *fontsetname = face->font_name;
  #endif
***************
*** 4709,4714 ****
--- 4711,4718 ----
                   myname, popup_path, suffix, fontsetname);
          XrmPutLineResource (&rdb, line);
          changed_p = 1;
+         if (fontsetname != face->font_name)
+           xfree (fontsetname);
        }
  
        if (changed_p && f->output_data.x->menubar_widget)