From: Jan Djärv <jan.h.d@swipnet.se>
Date: Fri, 18 Mar 2005 20:39:32 +0000 (+0000)
Subject: * xrdb.c (x_load_resources): Use different char *helv when I18N
X-Git-Tag: ttn-vms-21-2-B4~1709
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c7f6afd5989b696e8427f96f5fea27f621d16fb1;p=emacs.git

* xrdb.c (x_load_resources): Use different char *helv when I18N
is present.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a6604874e82..75f64930ab8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* xrdb.c (x_load_resources): Use different char *helv when I18N
+	is present.
+
 2005-03-17  Kenichi Handa  <handa@m17n.org>
 
 	* coding.c (syms_of_coding): Docstring of coding-category-list
diff --git a/src/xrdb.c b/src/xrdb.c
index ed701c64c63..e4d8b34cab7 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -527,7 +527,11 @@ x_load_resources (display, xrm_string, myname, myclass)
   XrmDatabase rdb;
   XrmDatabase db;
   char line[256];
+#ifdef HAVE_X_I18N
+  char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*,*";
+#else
   char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1";
+#endif
 #ifdef USE_MOTIF
   char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1";
   extern Lisp_Object Vdouble_click_time;