Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-23 05:17:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HAVE_NTGUI]: Declare Vwindow_system.

Browse source 
[HAVE_NTGUI] (main): Enable inhibit_window_system.
Initialize environment from registry.
Declare syms of Win32 windowing modules.
Use HAVE_WINDOW_SYSTEM instead of testing for specific window systems.
This commit is contained in:
Geoff Voelker 1995-11-07 07:16:44 +00:00
parent fd2e066a86
commit 8ba50e1ad0
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/emacs.c
View file

@ -110,9 +110,9 @@ int display_arg;
Tells GC how to save a copy of the stack. */
char *stack_bottom;
#ifdef HAVE_X_WINDOWS
#ifdef HAVE_WINDOW_SYSTEM
extern Lisp_Object Vwindow_system;
#endif /* HAVE_X_WINDOWS */
#endif /* HAVE_WINDOW_SYSTEM */
extern Lisp_Object Vauto_save_list_file_name;
@ -556,7 +556,7 @@ main (argc, argv, envp)
exit (1);
}
fprintf (stderr, "Using %s\n", term);
#ifdef HAVE_X_WINDOWS
#ifdef HAVE_WINDOW_SYSTEM
inhibit_window_system = 1; /* -t => -nw */
#endif
}
@ -750,6 +750,11 @@ Usage: %s [-t term] [--terminal term] [-nw] [--no-windows] [--batch]\n\
else init_gettimeofday ();
#endif
#ifdef WINDOWSNT
/* Initialize environment from registry settings. */
init_environment ();
#endif
/* egetenv is a pretty low-level facility, which may get called in
many circumstances; it seems flimsy to put off initializing it
until calling init_callproc. */
@ -866,6 +871,14 @@ Usage: %s [-t term] [--terminal term] [-nw] [--no-windows] [--batch]\n\
syms_of_xmenu ();
#endif
#ifdef HAVE_NTGUI
syms_of_win32term ();
syms_of_win32fns ();
syms_of_win32faces ();
syms_of_win32select ();
syms_of_win32menu ();
#endif /* HAVE_NTGUI */
#ifdef SYMS_SYSTEM
SYMS_SYSTEM;
#endif