From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 22 Mar 2005 21:42:44 +0000 (+0000)
Subject: * xrdb.c (x_load_resources): Undo previous change (2005-03-18).
X-Git-Tag: ttn-vms-21-2-B4~1620
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ca30ba48ff1449ae8fa4a9b9ae8da50bd16a2d4;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 35961e71976..30fc6990499 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/xrdb.c b/src/xrdb.c
index e4d8b34cab7..852fa2b808c 100644
--- 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;