Mercurial > emacs

changeset 29198:b3592c1e9ddb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* emacs.c (main): Initialize keyboard syms before initializing window code, so face names are available.
author Ken Raeburn <raeburn@raeburn.org>
date Thu, 25 May 2000 16:45:32 +0000
parents c58cb815dcfd
children cc07870ddb45
files src/ChangeLog src/emacs.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
Binary file src/ChangeLog has changed
--- 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 ();