Mercurial > emacs

changeset 13409:280f00071040

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[HAVE_NTGUI]: Declare Vwindow_system. [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.
author Geoff Voelker <voelker@cs.washington.edu>
date Tue, 07 Nov 1995 07:16:44 +0000
parents 7e92386e1cf7
children 7007664d3367
files src/emacs.c
diffstat 1 files changed, 16 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/emacs.c	Tue Nov 07 07:14:59 1995 +0000
+++ b/src/emacs.c	Tue Nov 07 07:16:44 1995 +0000
@@ -110,9 +110,9 @@
    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 @@
 	    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 @@
   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 @@
       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