From: Jan Djärv <jan.h.d@swipnet.se>
Date: Mon, 11 Jul 2005 14:28:43 +0000 (+0000)
Subject: * xfaces.c (x_update_menu_appearance): Use fontSet resource for
X-Git-Tag: emacs-pretest-22.0.90~8230
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a2d7e7225ce20a6bb9a6f3c4a39e9af1d9100d8d;p=emacs.git

* xfaces.c (x_update_menu_appearance): Use fontSet resource for
Lucid if X_I18N, font otherwise.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5c5654bfca9..c7b35c83175 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-11  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* xfaces.c (x_update_menu_appearance): Use fontSet resource for
+	Lucid if X_I18N, font otherwise.
+
 2005-07-10  Steven Tamm  <steventamm@mac.com>
 
 	* mac.c (Fmac_get_file_type, Fmac_get_file_creator): Added.
diff --git a/src/xfaces.c b/src/xfaces.c
index 616318daa63..2fb02360e50 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4717,8 +4717,13 @@ x_update_menu_appearance (f)
 #ifdef USE_MOTIF
 	  const char *suffix = "List";
 	  Bool motif = True;
+#else
+#if defined HAVE_X_I18N
+
+	  const char *suffix = "Set";
 #else
 	  const char *suffix = "";
+#endif
 	  Bool motif = False;
 #endif
 #if defined HAVE_X_I18N