summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2005-03-18 20:39:32 +0000
committerJan Djärv <jan.h.d@swipnet.se>2005-03-18 20:39:32 +0000
commit390981d363b05981b2aec3f85f7e1327871016ec (patch)
treef530a5bee1c648ee42ebc418012816cc01638cda
parentf5e9bc1e0e33dc03fad247d4f913fcb2138802d2 (diff)
downloademacs-390981d363b05981b2aec3f85f7e1327871016ec.tar.gz
* xrdb.c (x_load_resources): Use different char *helv when I18N
is present.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xrdb.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b497f371727..6602a73d1d4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
+
+ * xrdb.c (x_load_resources): Use different char *helv when I18N
+ is present.
+
2005-03-17 Kenichi Handa <handa@m17n.org>
* coding.c (syms_of_coding): Docstring of coding-category-list
diff --git a/src/xrdb.c b/src/xrdb.c
index ed701c64c63..e4d8b34cab7 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -527,7 +527,11 @@ 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;