aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2005-03-18 20:39:32 +0000
committerJan Djärv2005-03-18 20:39:32 +0000
commitc7f6afd5989b696e8427f96f5fea27f621d16fb1 (patch)
treebf9db60a01d31c841faec4f29a81e331479d1ff1 /src
parent280840475e44c808d6205c4e262441acae0a7431 (diff)
downloademacs-c7f6afd5989b696e8427f96f5fea27f621d16fb1.tar.gz
emacs-c7f6afd5989b696e8427f96f5fea27f621d16fb1.zip
* xrdb.c (x_load_resources): Use different char *helv when I18N
is present.
Diffstat (limited to 'src')
-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 a6604874e82..75f64930ab8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12005-03-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xrdb.c (x_load_resources): Use different char *helv when I18N
4 is present.
5
12005-03-17 Kenichi Handa <handa@m17n.org> 62005-03-17 Kenichi Handa <handa@m17n.org>
2 7
3 * coding.c (syms_of_coding): Docstring of coding-category-list 8 * 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)
527 XrmDatabase rdb; 527 XrmDatabase rdb;
528 XrmDatabase db; 528 XrmDatabase db;
529 char line[256]; 529 char line[256];
530#ifdef HAVE_X_I18N
531 char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*,*";
532#else
530 char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1"; 533 char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1";
534#endif
531#ifdef USE_MOTIF 535#ifdef USE_MOTIF
532 char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1"; 536 char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1";
533 extern Lisp_Object Vdouble_click_time; 537 extern Lisp_Object Vdouble_click_time;