Commit 211f2210 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(x_update_menu_appearance) [HAVE_X_I18N]:

Use xic_create_fontsetname even for non-Motif menus.
Don't forget to free the fontsetname.
parent 423a3f59
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.
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment