# HG changeset patch
# User Ken Raeburn <raeburn@raeburn.org>
# Date 959273132 0
# Node ID b3592c1e9ddbffd1a672aa6ab09c8a0a411cda45
# Parent  c58cb815dcfdc2ac9fdb1d72ec0300ee0df3e94b
* emacs.c (main): Initialize keyboard syms before initializing
window code, so face names are available.

diff -r c58cb815dcfd -r b3592c1e9ddb src/ChangeLog
Binary file src/ChangeLog has changed
diff -r c58cb815dcfd -r b3592c1e9ddb src/emacs.c
--- a/src/emacs.c	Thu May 25 16:40:12 2000 +0000
+++ b/src/emacs.c	Thu May 25 16:45:32 2000 +0000
@@ -1100,6 +1100,11 @@
 	 faces, and the face implementation uses some symbols as
 	 face names.  */
       syms_of_xfaces ();
+      /* Call syms_of_keyboard before init_window_once because
+	 keyboard sets up symbols that include some face names that
+	 the X support will want to use.  This can happen when
+	 CANNOT_DUMP is defined.  */
+      syms_of_keyboard ();
 
       init_window_once ();	/* Init the window system */
       init_fileio_once ();	/* Must precede any path manipulation.  */
@@ -1331,7 +1336,6 @@
 #endif /* CLASH_DETECTION */
       syms_of_indent ();
       syms_of_insdel ();
-      syms_of_keyboard ();
       syms_of_keymap ();
       syms_of_macros ();
       syms_of_marker ();