aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2005-03-22 21:42:44 +0000
committerJan Djärv2005-03-22 21:42:44 +0000
commit6ca30ba48ff1449ae8fa4a9b9ae8da50bd16a2d4 (patch)
tree9371b6fee5df2969be4ddd7cde589331d19013cb /src
parente9c19b68181e8b3bca6fe64e5d85dd31ea71bb16 (diff)
downloademacs-6ca30ba48ff1449ae8fa4a9b9ae8da50bd16a2d4.tar.gz
emacs-6ca30ba48ff1449ae8fa4a9b9ae8da50bd16a2d4.zip
* xrdb.c (x_load_resources): Undo previous change (2005-03-18).
Diffstat (limited to 'src')
-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 35961e71976..30fc6990499 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12005-03-22 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * xrdb.c (x_load_resources): Undo previous change (2005-03-18).
4
12005-03-22 David Kastrup <dak@gnu.org> 52005-03-22 David Kastrup <dak@gnu.org>
2 6
3 * textprop.c (Fnext_char_property_change) 7 * 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)
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 530
531 char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*,*";
532#else
533 char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1"; 531 char *helv = "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1";
534#endif 532
535#ifdef USE_MOTIF 533#ifdef USE_MOTIF
536 char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1"; 534 char *courier = "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1";
537 extern Lisp_Object Vdouble_click_time; 535 extern Lisp_Object Vdouble_click_time;