char **valptr;
int *skipptr;
{
- char *p;
+ char *p = NULL;
int arglen;
char *arg;
CANNOT_DUMP is defined. */
syms_of_keyboard ();
+#ifdef macintosh
+ /* init_window_once calls make_terminal_frame which on Mac OS creates
+ a full-fledge output_mac type frame. This does not work correctly
+ before syms_of_textprop, syms_of_macfns, syms_of_ccl,
+ syms_of_fontset, syms_of_xterm, syms_of_search, x_term_init, and
+ init_keyboard have already been called. */
+ syms_of_textprop ();
+ syms_of_macfns ();
+ syms_of_ccl ();
+ syms_of_fontset ();
+ syms_of_macterm ();
+ syms_of_macmenu ();
+ syms_of_data ();
+ syms_of_search ();
+
+ x_term_init ();
+ init_keyboard ();
+#endif
+
init_window_once (); /* Init the window system */
init_fileio_once (); /* Must precede any path manipulation. */
}
/* The basic levels of Lisp must come first */
/* And data must come first of all
for the sake of symbols like error-message */
+#ifndef macintosh
+ /* Called before init_window_once for Mac OS. */
syms_of_data ();
+#endif
syms_of_alloc ();
syms_of_lread ();
syms_of_print ();
syms_of_casetab ();
syms_of_callproc ();
syms_of_category ();
+#ifndef macintosh
+ /* Called before init_window_once for Mac OS. */
syms_of_ccl ();
+#endif
syms_of_charset ();
syms_of_cmds ();
#ifndef NO_DIR_LIBRARY
syms_of_minibuf ();
syms_of_mocklisp ();
syms_of_process ();
+#ifndef macintosh
+ /* Called before init_window_once for Mac OS. */
syms_of_search ();
+#endif
syms_of_frame ();
syms_of_syntax ();
syms_of_term ();
#ifdef HAVE_SOUND
syms_of_sound ();
#endif
-
+#ifndef macintosh
+ /* Called before init_window_once for Mac OS. */
syms_of_textprop ();
+#endif
syms_of_composite ();
#ifdef VMS
syms_of_vmsproc ();
#endif /* HAVE_X_WINDOWS */
#ifndef HAVE_NTGUI
+#ifndef macintosh
syms_of_xmenu ();
#endif
+#endif
#ifdef HAVE_NTGUI
syms_of_w32term ();
#endif /* VMS */
init_display (); /* Determine terminal type. init_sys_modes uses results */
}
+#ifndef macintosh
+ /* Called before init_window_once for Mac OS. */
init_keyboard (); /* This too must precede init_sys_modes */
+#endif
#ifdef VMS
init_vmsproc (); /* And this too. */
#endif /* VMS */
/* Enter editor command loop. This never returns. */
Frecursive_edit ();
/* NOTREACHED */
+ return 0;
}
\f
/* Sort the args so we can find the most important ones
malloc_state_ptr = malloc_get_state ();
#endif
-#ifdef REL_ALLOC_MMAP
+#ifdef USE_MMAP_FOR_BUFFERS
mmap_set_vars (0);
#endif
unexec (XSTRING (filename)->data,
!NILP (symfile) ? XSTRING (symfile)->data : 0, my_edata, 0, 0);
-#ifdef REL_ALLOC_MMAP
+#ifdef USE_MMAP_FOR_BUFFERS
mmap_set_vars (1);
#endif
#ifdef DOUG_LEA_MALLOC
Vsystem_type = intern (SYSTEM_TYPE);
DEFVAR_LISP ("system-configuration", &Vsystem_configuration,
- "Value is string indicating configuration Emacs was built for.");
+ "Value is string indicating configuration Emacs was built for.\n\
+On MS-Windows, the value reflects the OS flavor and version on which\n\
+Emacs is running.");
Vsystem_configuration = build_string (EMACS_CONFIGURATION);
DEFVAR_LISP ("system-configuration-options", &Vsystem_configuration_options,