(x_update_menu_appearance) [HAVE_X_I18N]:

Use xic_create_fontsetname even for non-Motif menus.
Don't forget to free the fontsetname.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3c45a623c31a9e76da47a3217a4f62c1ffa05ad1..83c4401be2758c497238da71aa856f2c40e742a6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * xfaces.c (x_update_menu_appearance) [HAVE_X_I18N]:
+       Use xic_create_fontsetname even for non-Motif menus.
+       Don't forget to free the fontsetname.
+
+       * xfns.c (xic_create_fontsetname): Add a final catch-all font pattern.
+
 2005-03-17  Richard M. Stallman  <rms@gnu.org>
 
        * dispnew.c (mirror_line_dance): Set W2 according to FRAME_FROM.

diff --git a/src/xfaces.c b/src/xfaces.c
index 53c79366264f1c4bf33f85a7c667f0c01c891348..753b20765d8d9eeca5c616d4cb216988ade7ef2a 100644 (file)
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4692,13 +4692,15 @@ x_update_menu_appearance (f)
        {
 #ifdef USE_MOTIF
          const char *suffix = "List";
+         Bool motif = True;
 #else
          const char *suffix = "";
+         Bool motif = False;
 #endif
-#if defined HAVE_X_I18N && defined USE_MOTIF
+#if defined HAVE_X_I18N
          extern char *xic_create_fontsetname
            P_ ((char *base_fontname, Bool motif));
-         char *fontsetname = xic_create_fontsetname (face->font_name, True);
+         char *fontsetname = xic_create_fontsetname (face->font_name, motif);
 #else
          char *fontsetname = face->font_name;
 #endif
@@ -4709,6 +4711,8 @@ x_update_menu_appearance (f)
                   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)