aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv <[email protected]>2005-03-22 21:42:44 +0000
committerJan Djärv <[email protected]>2005-03-22 21:42:44 +0000
commit6ca30ba48ff1449ae8fa4a9b9ae8da50bd16a2d4 (patch)
tree9371b6fee5df2969be4ddd7cde589331d19013cb
parente9c19b68181e8b3bca6fe64e5d85dd31ea71bb16 (diff)
* xrdb.c (x_load_resources): Undo previous change (2005-03-18).
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xrdb.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 35961e7197..30fc699049 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-22 Jan Dj,Ad(Brv <[email protected]>
+
+ * xrdb.c (x_load_resources): Undo previous change (2005-03-18).
+
2005-03-22 David Kastrup <[email protected]>
* textprop.c (Fnext_char_property_change)
diff --git a/src/xrdb.c b/src/xrdb.c
index e4d8b34cab..852fa2b808 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;