Commit 7a18af49 authored by Ken Raeburn's avatar Ken Raeburn

* emacs.c (main): Initialize keyboard syms before initializing

window code, so face names are available.
parent 50d7ce09
No preview for this file type
...@@ -1100,6 +1100,11 @@ main (argc, argv, envp) ...@@ -1100,6 +1100,11 @@ main (argc, argv, envp)
faces, and the face implementation uses some symbols as faces, and the face implementation uses some symbols as
face names. */ face names. */
syms_of_xfaces (); 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_window_once (); /* Init the window system */
init_fileio_once (); /* Must precede any path manipulation. */ init_fileio_once (); /* Must precede any path manipulation. */
...@@ -1331,7 +1336,6 @@ main (argc, argv, envp) ...@@ -1331,7 +1336,6 @@ main (argc, argv, envp)
#endif /* CLASH_DETECTION */ #endif /* CLASH_DETECTION */
syms_of_indent (); syms_of_indent ();
syms_of_insdel (); syms_of_insdel ();
syms_of_keyboard ();
syms_of_keymap (); syms_of_keymap ();
syms_of_macros (); syms_of_macros ();
syms_of_marker (); syms_of_marker ();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment