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

is present.

diff --git a/src/ChangeLog b/src/ChangeLog
index a6604874e8261568d10a5d473e60abf40ed9e27f..75f64930ab8d8dabbd6330421e6e42147ced2947 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-18  Jan Dj\e,Ad\e(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 ed701c64c639d8570b471fa0c66736ac2cfa61aa..e4d8b34cab7f47214a092965ba52ff51af010f5f 100644 (file)
--- 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;