Commit 8bb697c0 authored by Richard M. Stallman's avatar Richard M. Stallman

(main): Call the syms_of_... and keys_of_... functions

earlier, before init_vms_input and init_display.
parent d84b06ef
...@@ -1076,30 +1076,8 @@ the Bugs section of the Emacs manual or the file BUGS.\n", argv[0]); ...@@ -1076,30 +1076,8 @@ the Bugs section of the Emacs manual or the file BUGS.\n", argv[0]);
init_callproc (); /* Must follow init_cmdargs but not init_sys_modes. */ init_callproc (); /* Must follow init_cmdargs but not init_sys_modes. */
init_lread (); init_lread ();
if (!noninteractive) /* Intern the names of all standard functions and variables;
{ define standard keys. */
#ifdef VMS
init_vms_input ();/* init_display calls get_frame_size, that needs this */
#endif /* VMS */
init_display (); /* Determine terminal type. init_sys_modes uses results */
}
init_keyboard (); /* This too must precede init_sys_modes */
#ifdef VMS
init_vmsproc (); /* And this too. */
#endif /* VMS */
init_sys_modes (); /* Init system terminal modes (RAW or CBREAK, etc.) */
init_xdisp ();
init_macros ();
init_editfns ();
#ifdef LISP_FLOAT_TYPE
init_floatfns ();
#endif
#ifdef VMS
init_vmsfns ();
#endif /* VMS */
init_process ();
/* Intern the names of all standard functions and variables; define standard keys */
if (!initialized) if (!initialized)
{ {
...@@ -1203,6 +1181,29 @@ the Bugs section of the Emacs manual or the file BUGS.\n", argv[0]); ...@@ -1203,6 +1181,29 @@ the Bugs section of the Emacs manual or the file BUGS.\n", argv[0]);
keys_of_frame (); keys_of_frame ();
} }
if (!noninteractive)
{
#ifdef VMS
init_vms_input ();/* init_display calls get_frame_size, that needs this */
#endif /* VMS */
init_display (); /* Determine terminal type. init_sys_modes uses results */
}
init_keyboard (); /* This too must precede init_sys_modes */
#ifdef VMS
init_vmsproc (); /* And this too. */
#endif /* VMS */
init_sys_modes (); /* Init system terminal modes (RAW or CBREAK, etc.) */
init_xdisp ();
init_macros ();
init_editfns ();
#ifdef LISP_FLOAT_TYPE
init_floatfns ();
#endif
#ifdef VMS
init_vmsfns ();
#endif /* VMS */
init_process ();
if (!initialized) if (!initialized)
{ {
char *file; char *file;
......
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