Mercurial > emacs
changeset 60669:cffa9a821286
(x_update_menu_appearance) [USE_MOTIF]:
Use xic_create_fontsetname to create a fontset so utf-8 locales work.
(dump_realized_face): Fix warning.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 17 Mar 2005 18:43:47 +0000 |
| parents | 34f4b9f0b40d |
| children | 68d57432d36d |
| files | src/xfaces.c |
| diffstat | 1 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xfaces.c Thu Mar 17 18:32:33 2005 +0000 +++ b/src/xfaces.c Thu Mar 17 18:43:47 2005 +0000 @@ -4695,11 +4695,18 @@ #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 sprintf (line, "%s.pane.menubar*font%s: %s", - myname, suffix, face->font_name); + myname, suffix, fontsetname); XrmPutLineResource (&rdb, line); sprintf (line, "%s.%s*font%s: %s", - myname, popup_path, suffix, face->font_name); + myname, popup_path, suffix, fontsetname); XrmPutLineResource (&rdb, line); changed_p = 1; } @@ -7765,7 +7772,7 @@ { fprintf (stderr, "ID: %d\n", face->id); #ifdef HAVE_X_WINDOWS - fprintf (stderr, "gc: %d\n", (int) face->gc); + fprintf (stderr, "gc: %ld\n", (long) face->gc); #endif fprintf (stderr, "foreground: 0x%lx (%s)\n", face->foreground,