From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 17 Mar 2005 18:43:47 +0000 (+0000)
Subject: (x_update_menu_appearance) [USE_MOTIF]:
X-Git-Tag: ttn-vms-21-2-B4~1750
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2defe37faf5acd6ca3b2085eb3c1ff96174d616a;p=emacs.git

(x_update_menu_appearance) [USE_MOTIF]:
Use xic_create_fontsetname to create a fontset so utf-8 locales work.
(dump_realized_face): Fix warning.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index c02295c7a27..53c79366264 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4694,12 +4694,19 @@ x_update_menu_appearance (f)
 	  const char *suffix = "List";
 #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,