Mercurial > emacs
changeset 21962:c452f82d8d45
(main): Call the syms_of_... and keys_of_... functions
earlier, before init_vms_input and init_display.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Wed, 06 May 1998 20:44:38 +0000 |
| parents | ace3a9c44f3a |
| children | b717a61747c5 |
| files | src/emacs.c |
| diffstat | 1 files changed, 25 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/src/emacs.c Wed May 06 19:54:57 1998 +0000 +++ b/src/emacs.c Wed May 06 20:44:38 1998 +0000 @@ -1076,30 +1076,8 @@ init_callproc (); /* Must follow init_cmdargs but not init_sys_modes. */ init_lread (); - 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 (); - -/* Intern the names of all standard functions and variables; define standard keys */ + /* Intern the names of all standard functions and variables; + define standard keys. */ if (!initialized) { @@ -1203,6 +1181,29 @@ 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) { char *file;