Mercurial > emacs
changeset 60699:11723b2eac2e
(x_update_menu_appearance) [HAVE_X_I18N]:
Use xic_create_fontsetname even for non-Motif menus.
Don't forget to free the fontsetname.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 18 Mar 2005 04:21:17 +0000 |
| parents | 3e557e11645e |
| children | 2610d09357c8 |
| files | src/ChangeLog src/xfaces.c |
| diffstat | 2 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Mar 18 04:19:41 2005 +0000 +++ b/src/ChangeLog Fri Mar 18 04:21:17 2005 +0000 @@ -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.
--- a/src/xfaces.c Fri Mar 18 04:19:41 2005 +0000 +++ b/src/xfaces.c Fri Mar 18 04:21:17 2005 +0000 @@ -4692,13 +4692,15 @@ { #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 @@ 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)