xemacs-beta: src/emacs.c comparison

comparison src/emacs.c @ 446:1ccc32a20af4 r21-2-38

Import from CVS: tag r21-2-38

author	cvs
date	Mon, 13 Aug 2007 11:37:21 +0200
parents	576fb035e263
children	e7ef97881643

comparison

equal deleted inserted replaced

-:34f3776fcf0e
+:1ccc32a20af4
 /* WARNING!
 Some LISP-visible command-line options are set by XEmacs _before_ the
 data is dumped in building a --pdump XEmacs, but used _after_ it is
-restored in normal operation.  Thus the restored values overwrite the
+restored in normal operation.  Thus the dump-time values overwrite the
-values XEmacs is getting at run-time.  Such variables must be saved
+values XEmacs is getting at runtime.  Such variables must be saved
 before loading the dumpfile, and restored afterward.
-This is done immediately before and after pdump_load() in main_1().
+Therefore these variables may not be initialized in vars_of_emacs().
-See that function for the current list of protected variables.
+The save/restore is done immediately before and after pdump_load() in
-Note that if the variable is never DEFVAR'd, saving/restoring is not
+main_1().  See that function for the current list of protected variables.
-needed.
+Note that saving/restoring is only necessary for a few variables that are
+o command line arguments effective at runtime (as opposed to dump-time),
+o parsed before pdump_load, and
+o exported to Lisp via a DEFVAR.
 */
 /* Nonzero means running XEmacs without interactive terminal.  */
 int noninteractive;
 /* Make stack traces always identify version + configuration */
 #define main_1 STACK_TRACE_EYE_CATCHER
 /* This function is not static, so that the compiler is less likely to
-inline it, which would make it not show up in stack traces.  */
+inline it, which would make it not show up in stack traces.
+The restart argument is a flag that indicates that main_1 is now
+being called for the second time in this invocation of xemacs; this can
+only happen in an xemacs that is not loaded with dumped data (temacs
+with the conventional dumper or xemacs -nd with the pdumper).   See
+Frun_emacs_from_temacs().
+restart interacts with initialized as follows (per Olivier Galibert):
+It's perverted.
+initialized==0 => temacs
+initialized!=0 && restart!=0 => run-temacs
+initialized!=0 && restart==0 => xemacs/post pdump_load()
+*/
 DECLARE_DOESNT_RETURN (main_1 (int, char **, char **, int));
 DOESNT_RETURN
 main_1 (int argc, char **argv, char **envp, int restart)
 {
 char stack_bottom_variable;
 if (argmatch (argv, argc, "-sd", "--show-dump-id", 9, NULL, &skip_args))
 {
 #ifdef PDUMP
 printf ("%08x\n", dump_id);
 #else
-printf ("*ERROR**\n");
+printf ("Portable dumper not configured; -sd just forces exit.\n");
 #endif
 exit (0);
 }
 /* Handle the -t switch, which specifies filename to use as terminal */
 and restored after loading the dumped data.
 Boy, this is ugly, but how else to do it?
 */
-/* noninteractive1 is protected by noninteractive, which is not
+/* noninteractive1 is saved in noninteractive, which isn't LISP-visible */
-LISP-visible */
 int inhibit_early_packages_save = inhibit_early_packages;
 int inhibit_autoloads_save      = inhibit_autoloads;
 int debug_paths_save            = debug_paths;
-#ifdef INHIBIT_SITE_LISP
+/* #### Give inhibit-site-lisp a command switch?  If so, uncomment: */
-int inhibit_site_lisp_save      = inhibit_site_lisp;
+/* int inhibit_site_lisp_save      = inhibit_site_lisp; */
-#endif
-#ifdef INHIBIT_SITE_MODULES
 int inhibit_site_modules_save   = inhibit_site_modules;
-#endif
 initialized = pdump_load (argv[0]);
 /* Now unstomp everything */
 noninteractive1        = noninteractive;
 inhibit_early_packages = inhibit_early_packages_save;
 inhibit_autoloads      = inhibit_autoloads_save;
 debug_paths            = debug_paths_save;
-#ifdef INHIBIT_SITE_LISP
+/* #### Give inhibit-site-lisp a command switch?  If so, uncomment: */
-inhibit_site_lisp      = inhibit_site_lisp_save;
+/* inhibit_site_lisp      = inhibit_site_lisp_save; */
-#endif
-#ifdef INHIBIT_SITE_MODULES
 inhibit_site_modules   = inhibit_site_modules_save;
-#endif
 if (initialized)
 run_temacs_argc = -1;
 else
 purify_flag = 1;
 	 Fcons()
 	 listN()
 	 make_opaque_ptr()
 	 perhaps a few others.
+NB:  Initialization or assignment should not be done here to certain
+variables settable from the command line.  See the comment above
+the call to pdump_load() in main_1().  This caveat should only
+apply to vars_of_emacs().
 */
 /* Now allow Fprovide() statements to be made. */
 init_provide_once ();
 	if (always_gc)                /* purification debugging hack */
 	  garbage_collect_1 ();
 }
 #endif
 #ifdef PDUMP
-} else if (!restart) {
+} else if (!restart) {	      /* after successful pdump_load() */
 reinit_alloc_once_early ();
 reinit_symbols_once_early ();
 reinit_opaque_once_early ();
 reinit_console_type_create_stream ();
 /* CONGRATULATIONS!!!  We have successfully initialized the Lisp
 engine. */
 if (initialized)
 {
-/* Stuff that needs to be reset at run time.  Order below should
+/* Stuff that should not be done at dump time, including stuff that
-	 not matter. */
+needs to be reset at run time.  Order below should not matter.
+Many initializations taken from the environment should go here. */
 reinit_alloc ();
 reinit_eval ();
 #ifdef MULE_REGEXP
 reinit_mule_category ();
+#endif
+#ifdef HAVE_POSTGRESQL
+init_postgresql_from_environment();
 #endif
 }
 /* Now do further initialization/setup of stuff that is not needed by the
 syms_of_() routines.  This involves stuff that only is enabled in
 * The target is to override the static constructor from the
 * libiflPNG.so library which is masquerading as libz, and
 * cores on us when re-started from the dumped executable.
 * This will have to go for 21.1  -- OG.
 */
-void __sti__iflPNGFile_c___(void);
+void __sti__iflPNGFile_c___ (void);
-void __sti__iflPNGFile_c___()
+void
+__sti__iflPNGFile_c___ (void)
 {
 }
 #endif

Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 446:1ccc32a20af4 r21-2-38