# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1111527764 0
# Node ID 35cf880004899e61289abac7254f948912f9a479
# Parent  583a7eb791ddeab34476294b75f5e18d68cee659
* xrdb.c (x_load_resources): Undo previous change (2005-03-18).

diff -r 583a7eb791dd -r 35cf88000489 src/ChangeLog
--- a/src/ChangeLog	Tue Mar 22 21:41:27 2005 +0000
+++ b/src/ChangeLog	Tue Mar 22 21:42:44 2005 +0000
@@ -1,3 +1,7 @@
+2005-03-22  Jan Dj,Ad(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 -r 583a7eb791dd -r 35cf88000489 src/xrdb.c
--- a/src/xrdb.c	Tue Mar 22 21:41:27 2005 +0000
+++ b/src/xrdb.c	Tue Mar 22 21:42:44 2005 +0000
@@ -527,11 +527,9 @@
   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;