* xrdb.c (x_load_resources): Undo previous change (2005-03-18).

diff --git a/src/ChangeLog b/src/ChangeLog
index 35961e7197673c438ba5beed0d7555c178bd0259..30fc69904997b4feb78ccedbe5e742aaff4033d5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-22  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xrdb.c (x_load_resources): Undo previous change (2005-03-18).
+
 2005-03-22  David Kastrup  <dak@gnu.org>
 
        * textprop.c (Fnext_char_property_change)

diff --git a/src/xrdb.c b/src/xrdb.c
index e4d8b34cab7f47214a092965ba52ff51af010f5f..852fa2b808c08ebf2b22788a750778149225ae64 100644 (file)
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -527,11 +527,9 @@ 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;