diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-03-17 18:43:47 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-03-17 18:43:47 +0000 |
| commit | 2defe37faf5acd6ca3b2085eb3c1ff96174d616a (patch) | |
| tree | d039799c24e872e6e4db25f355ea535a95e1f569 /src/xfaces.c | |
| parent | c28e7ae824ee16d3d89fde77a0ca178f85576775 (diff) | |
| download | emacs-2defe37faf5acd6ca3b2085eb3c1ff96174d616a.tar.gz | |
(x_update_menu_appearance) [USE_MOTIF]:
Use xic_create_fontsetname to create a fontset so utf-8 locales work.
(dump_realized_face): Fix warning.
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index c02295c7a27..53c79366264 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -4695,11 +4695,18 @@ x_update_menu_appearance (f) #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 @@ dump_realized_face (face) { 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, |