changeset 60830:35cf88000489

* xrdb.c (x_load_resources): Undo previous change (2005-03-18).
author Jan Djärv <jan.h.d@swipnet.se>
date Tue, 22 Mar 2005 21:42:44 +0000
parents 583a7eb791dd
children 74476de5b3b7
files src/ChangeLog src/xrdb.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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;