XEmacs 21.2.33 "Melpomene".

[chise/xemacs-chise.git.1] / src / emacs.c

diff --git a/src/emacs.c b/src/emacs.c
index c3fc9fc..fe1d119 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -36,6 +36,7 @@ Boston, MA 02111-1307, USA.  */
 #include "console.h"
 #include "process.h"
 #include "redisplay.h"
 #include "console.h"
 #include "process.h"
 #include "redisplay.h"

+#include "frame.h"

 #include "sysdep.h"
 
 #include "syssignal.h" /* Always include before systty.h */
 #include "sysdep.h"
 
 #include "syssignal.h" /* Always include before systty.h */

@@ -43,6 +44,15 @@ Boston, MA 02111-1307, USA.  */
 #include "sysfile.h"
 #include "systime.h"
 
 #include "sysfile.h"
 #include "systime.h"
 

+#ifdef PDUMP
+#include "dump-id.h"
+#include "dumper.h"
+#endif
+
+#ifndef SEPCHAR
+#define SEPCHAR ':'
+#endif
+

 #ifdef QUANTIFY
 #include <quantify.h>
 #endif
 #ifdef QUANTIFY
 #include <quantify.h>
 #endif

@@ -57,13 +67,7 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #ifdef TOOLTALK
 #endif
 
 #ifdef TOOLTALK

-#include TT_C_H_PATH
-#endif
-
-#ifdef APOLLO
-#ifndef APOLLO_SR10
-#include <default_acl.h>
-#endif
+#include TT_C_H_FILE

 #endif
 
 #if defined (WINDOWSNT)
 #endif
 
 #if defined (WINDOWSNT)

@@ -73,11 +77,11 @@ Boston, MA 02111-1307, USA.  */
 /* For PATH_EXEC */
 #include <paths.h>
 
 /* For PATH_EXEC */
 #include <paths.h>
 

-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)

 void report_sheap_usage (int die_if_pure_storage_exceeded);
 #endif
 
 void report_sheap_usage (int die_if_pure_storage_exceeded);
 #endif
 

-#if !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC
+#if !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC)

 extern void *(*__malloc_hook)(size_t);
 extern void *(*__realloc_hook)(void *, size_t);
 extern void (*__free_hook)(void *);
 extern void *(*__malloc_hook)(size_t);
 extern void *(*__realloc_hook)(void *, size_t);
 extern void (*__free_hook)(void *);

@@ -151,10 +155,11 @@ Lisp_Object Vdata_directory, Vconfigure_data_directory;
 Lisp_Object Vdoc_directory, Vconfigure_doc_directory;
 Lisp_Object Vconfigure_lock_directory;
 Lisp_Object Vdata_directory_list;
 Lisp_Object Vdoc_directory, Vconfigure_doc_directory;
 Lisp_Object Vconfigure_lock_directory;
 Lisp_Object Vdata_directory_list;

-Lisp_Object Vinfo_directory, Vconfigure_info_directory;
+Lisp_Object Vconfigure_info_directory;

 Lisp_Object Vsite_directory, Vconfigure_site_directory;
 Lisp_Object Vconfigure_info_path;
 Lisp_Object Vinternal_error_checking;
 Lisp_Object Vsite_directory, Vconfigure_site_directory;
 Lisp_Object Vconfigure_info_path;
 Lisp_Object Vinternal_error_checking;

+Lisp_Object Vmail_lock_methods, Vconfigure_mail_lock_method;

 Lisp_Object Vpath_separator;
 
 /* The default base directory XEmacs is installed under. */
 Lisp_Object Vpath_separator;
 
 /* The default base directory XEmacs is installed under. */

@@ -175,7 +180,7 @@ int display_arg;
 /* Type of display specified.  We cannot use a Lisp symbol here because
    Lisp symbols may not initialized at the time that we set this
    variable. */
 /* Type of display specified.  We cannot use a Lisp symbol here because
    Lisp symbols may not initialized at the time that we set this
    variable. */

-CONST char *display_use;
+const char *display_use;

 
 /* If non-zero, then the early error handler will only print the error
    message and exit. */
 
 /* If non-zero, then the early error handler will only print the error
    message and exit. */

@@ -217,12 +222,16 @@ int inhibit_early_packages;
 /* Nonzero means don't load package autoloads at startup */
 int inhibit_autoloads;
 
 /* Nonzero means don't load package autoloads at startup */
 int inhibit_autoloads;
 

+/* Nonzero means don't load the dump file (ignored if not PDUMP)  */
+
+int nodumpfile;
+

 /* Nonzero means print debug information about path searching */
 int debug_paths;
 
 /* Save argv and argc.  */
 /* Nonzero means print debug information about path searching */
 int debug_paths;
 
 /* Save argv and argc.  */

-char **initial_argv;
-int initial_argc;
+static char **initial_argv;
+static int initial_argc;

 
 static void sort_args (int argc, char **argv);
 
 
 static void sort_args (int argc, char **argv);
 

@@ -238,6 +247,14 @@ static int fatal_error_code;
 /* Nonzero if handling a fatal error already */
 static int fatal_error_in_progress;
 
 /* Nonzero if handling a fatal error already */
 static int fatal_error_in_progress;
 

+static JMP_BUF run_temacs_catch;
+
+static int run_temacs_argc;
+static char **run_temacs_argv;
+static char *run_temacs_args;
+static size_t run_temacs_argv_size;
+static size_t run_temacs_args_size;
+

 static void shut_down_emacs (int sig, Lisp_Object stuff);
 
 /* Handle bus errors, illegal instruction, etc. */
 static void shut_down_emacs (int sig, Lisp_Object stuff);
 
 /* Handle bus errors, illegal instruction, etc. */

@@ -260,7 +277,7 @@ fatal_error_signal (int sig)
 # if 0 /* This is evil, rarely useful, and causes grief in some cases. */
       /* Check for Sun-style stack printing via /proc */
       {
 # if 0 /* This is evil, rarely useful, and causes grief in some cases. */
       /* Check for Sun-style stack printing via /proc */
       {

-        CONST char *pstack = "/usr/proc/bin/pstack";
+        const char *pstack = "/usr/proc/bin/pstack";

         if (access (pstack, X_OK) == 0)
           {
             char buf[100];
         if (access (pstack, X_OK) == 0)
           {
             char buf[100];

@@ -278,61 +295,6 @@ fatal_error_signal (int sig)
 }
 \f
 
 }
 \f
 

-DOESNT_RETURN
-fatal (CONST char *fmt, ...)
-{
-  va_list args;
-  va_start (args, fmt);
-
-  fprintf (stderr, "\nXEmacs: ");
-  vfprintf (stderr, GETTEXT (fmt), args);
-  fprintf (stderr, "\n");
-
-  va_end (args);
-  fflush (stderr);
-  exit (1);
-}
-
-/* #### The following two functions should be replaced with
-   calls to emacs_doprnt_*() functions, with STREAM set to send out
-   to stdout or stderr.  This is the only way to ensure that
-   I18N3 works properly (many implementations of the *printf()
-   functions, including the ones included in glibc, do not implement
-   the %###$ argument-positioning syntax). */
-
-/* exactly equivalent to fprintf (stderr, fmt, ...) except that it calls
-   GETTEXT on the format string. */
-
-int
-stderr_out (CONST char *fmt, ...)
-{
-  int retval;
-  va_list args;
-  va_start (args, fmt);
-
-  retval = vfprintf (stderr, GETTEXT (fmt), args);
-
-  va_end (args);
-  /* fflush (stderr); */
-  return retval;
-}
-
-/* exactly equivalent to fprintf (stdout, fmt, ...) except that it calls
-   GETTEXT on the format string. */
-
-int
-stdout_out (CONST char *fmt, ...)
-{
-  int retval;
-  va_list args;
-  va_start (args, fmt);
-
-  retval = vfprintf (stdout, GETTEXT (fmt), args);
-
-  va_end (args);
-  return retval;
-}
-

 #ifdef SIGDANGER
 
 /* Handler for SIGDANGER.  */
 #ifdef SIGDANGER
 
 /* Handler for SIGDANGER.  */

@@ -369,7 +331,7 @@ make_arg_list_1 (int argc, char **argv, int skip_args)
              /* Do not trust to what crt0 has stuffed into argv[0] */
              char full_exe_path [MAX_PATH];
              GetModuleFileName (NULL, full_exe_path, MAX_PATH);
              /* Do not trust to what crt0 has stuffed into argv[0] */
              char full_exe_path [MAX_PATH];
              GetModuleFileName (NULL, full_exe_path, MAX_PATH);

-             result = Fcons (build_ext_string (full_exe_path, FORMAT_FILENAME),
+             result = Fcons (build_ext_string (full_exe_path, Qfile_name),

                              result);
 #if defined(HAVE_SHLIB)
              (void)dll_init(full_exe_path);
                              result);
 #if defined(HAVE_SHLIB)
              (void)dll_init(full_exe_path);

@@ -377,7 +339,8 @@ make_arg_list_1 (int argc, char **argv, int skip_args)
            }
          else
 #endif
            }
          else
 #endif

-           result = Fcons (build_ext_string (argv [i], FORMAT_FILENAME), result);
+           result = Fcons (build_ext_string (argv [i], Qfile_name),
+                           result);

        }
     }
   return result;
        }
     }
   return result;

@@ -401,10 +364,12 @@ make_argc_argv (Lisp_Object argv_list, int *argc, char ***argv)
 
   for (i = 0, next = argv_list; i < n; i++, next = XCDR (next))
     {
 
   for (i = 0, next = argv_list; i < n; i++, next = XCDR (next))
     {

-      CONST char *temp;
+      const char *temp;

       CHECK_STRING (XCAR (next));
 
       CHECK_STRING (XCAR (next));
 

-      GET_C_STRING_EXT_DATA_ALLOCA (XCAR (next), FORMAT_OS, temp);
+      TO_EXTERNAL_FORMAT (LISP_STRING, XCAR (next),
+                         C_STRING_ALLOCA, temp,
+                         Qnative);

       (*argv) [i] = xstrdup (temp);
     }
   (*argv) [n] = 0;
       (*argv) [i] = xstrdup (temp);
     }
   (*argv) [n] = 0;

@@ -547,7 +512,8 @@ main_1 (int argc, char **argv, char **envp, int restart)
   extern int malloc_cookie;
 #endif
 
   extern int malloc_cookie;
 #endif
 

-#if !defined(SYSTEM_MALLOC) && !defined(HAVE_LIBMCHECK)
+#if (!defined (SYSTEM_MALLOC) && !defined (HAVE_LIBMCHECK)     \
+     && !defined (DOUG_LEA_MALLOC))

   /* Make sure that any libraries we link against haven't installed a
      hook for a gmalloc of a potentially incompatible version. */
   /* If we're using libmcheck, the hooks have already been initialized, */
   /* Make sure that any libraries we link against haven't installed a
      hook for a gmalloc of a potentially incompatible version. */
   /* If we're using libmcheck, the hooks have already been initialized, */

@@ -555,7 +521,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
   __malloc_hook = NULL;
   __realloc_hook = NULL;
   __free_hook = NULL;
   __malloc_hook = NULL;
   __realloc_hook = NULL;
   __free_hook = NULL;

-#endif /* not SYSTEM_MALLOC */
+#endif /* not SYSTEM_MALLOC or HAVE_LIBMCHECK or DOUG_LEA_MALLOC */

 
   noninteractive = 0;
 
 
   noninteractive = 0;
 

@@ -569,7 +535,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
    * But hey, it solves all NS related memory problems, so who's
    * complaining? */
   if (initialized && malloc_jumpstart (malloc_cookie) != 0)
    * But hey, it solves all NS related memory problems, so who's
    * complaining? */
   if (initialized && malloc_jumpstart (malloc_cookie) != 0)

-    fprintf (stderr, "malloc jumpstart failed!\n");
+    stderr_out ("malloc jumpstart failed!\n");

 #endif /* NeXT */
 
   /*
 #endif /* NeXT */
 
   /*

@@ -587,22 +553,6 @@ main_1 (int argc, char **argv, char **envp, int restart)
 
   sort_args (argc, argv);
 
 
   sort_args (argc, argv);
 

-  /* Map in shared memory, if we are using that.  */
-#ifdef HAVE_SHM
-  if (argmatch (argv, argc, "-nl", "--no-shared-memory", 6, NULL, &skip_args))
-    {
-      map_in_data (0);
-      /* The shared memory was just restored, which clobbered this.  */
-      skip_args = 1;
-    }
-  else
-    {
-      map_in_data (1);
-      /* The shared memory was just restored, which clobbered this.  */
-      skip_args = 0;
-    }
-#endif /* HAVE_SHM */
-

 #if (defined (MSDOS) && defined (EMX)) || defined (WIN32) || defined (_SCO_DS)
   environ = envp;
 #endif
 #if (defined (MSDOS) && defined (EMX)) || defined (WIN32) || defined (_SCO_DS)
   environ = envp;
 #endif

@@ -617,15 +567,6 @@ main_1 (int argc, char **argv, char **envp, int restart)
 
   clearerr (stdin);
 
 
   clearerr (stdin);
 

-#ifdef APOLLO
-#ifndef APOLLO_SR10
-  /* If USE_DOMAIN_ACLS environment variable exists,
-     use ACLs rather than UNIX modes. */
-  if (egetenv ("USE_DOMAIN_ACLS"))
-    default_acl (USE_DEFACL);
-#endif
-#endif /* APOLLO */
-

 #if defined (HAVE_MMAP) && defined (REL_ALLOC)
   /* ralloc can only be used if using the GNU memory allocator. */
   init_ralloc ();
 #if defined (HAVE_MMAP) && defined (REL_ALLOC)
   /* ralloc can only be used if using the GNU memory allocator. */
   init_ralloc ();

@@ -670,6 +611,17 @@ main_1 (int argc, char **argv, char **envp, int restart)
   inhibit_window_system = 1;
 #endif
 
   inhibit_window_system = 1;
 #endif
 

+  /* Handle the -sd/--show-dump-id switch, which means show the hex dump_id and quit */
+  if (argmatch (argv, argc, "-sd", "--show-dump-id", 9, NULL, &skip_args))
+    {
+#ifdef PDUMP
+      printf ("%08x\n", dump_id);
+#else
+      printf ("*ERROR**\n");
+#endif
+      exit (0);
+    }
+

   /* Handle the -t switch, which specifies filename to use as terminal */
   {
     char *term;
   /* Handle the -t switch, which specifies filename to use as terminal */
   {
     char *term;

@@ -691,6 +643,12 @@ main_1 (int argc, char **argv, char **envp, int restart)
       }
   }
 
       }
   }
 

+  /* Handle the --no-dump-file/-nd switch, which means don't load the dump file (ignored when not using pdump) */
+  if (argmatch (argv, argc, "-nd", "--no-dump-file", 7, NULL, &skip_args))
+    {
+      nodumpfile = 1;
+    }
+

   /* Handle -nw switch */
   if (argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args))
     inhibit_window_system = 1;
   /* Handle -nw switch */
   if (argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args))
     inhibit_window_system = 1;

@@ -855,6 +813,28 @@ main_1 (int argc, char **argv, char **envp, int restart)
      We try to do things in an order that minimizes the non-obvious
      dependencies between functions. */
 
      We try to do things in an order that minimizes the non-obvious
      dependencies between functions. */
 

+  /* purify_flag 1 is correct even if CANNOT_DUMP.
+   * loadup.el will set to nil at end. */
+
+  purify_flag = 0;
+#ifdef PDUMP
+  if (restart)
+    initialized = 1;
+  else if (nodumpfile) {
+    initialized = 0;
+    purify_flag = 1;
+  } else {
+    initialized = pdump_load (argv[0]);
+    if (initialized)
+      run_temacs_argc = -1;
+    else
+      purify_flag = 1;
+  }
+#else
+  if (!initialized)
+    purify_flag = 1;
+#endif
+

   if (!initialized)
     {
       /* Initialize things so that new Lisp objects
   if (!initialized)
     {
       /* Initialize things so that new Lisp objects

@@ -866,7 +846,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
 
       /* Initialize Qnil, Qt, Qunbound, and the
         obarray.  After this, symbols can be
 
       /* Initialize Qnil, Qt, Qunbound, and the
         obarray.  After this, symbols can be

-        interned.  This depends on init_alloc_once(). */
+        interned.  This depends on init_alloc_once_early(). */

       init_symbols_once_early ();
 
       /* Declare the basic symbols pertaining to errors,
       init_symbols_once_early ();
 
       /* Declare the basic symbols pertaining to errors,

@@ -881,6 +861,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
         The *only* thing that the syms_of_*() functions are allowed to do
         is call one of the following three functions:
 
         The *only* thing that the syms_of_*() functions are allowed to do
         is call one of the following three functions:
 

+        INIT_LRECORD_IMPLEMENTATION()

         defsymbol()
         defsubr() (i.e. DEFSUBR)
         deferror()
         defsymbol()
         defsubr() (i.e. DEFSUBR)
         deferror()

@@ -891,9 +872,6 @@ main_1 (int argc, char **argv, char **envp, int restart)
 
       syms_of_abbrev ();
       syms_of_alloc ();
 
       syms_of_abbrev ();
       syms_of_alloc ();

-#ifdef HAVE_X_WINDOWS
-      syms_of_balloon_x ();
-#endif

       syms_of_buffer ();
       syms_of_bytecode ();
       syms_of_callint ();
       syms_of_buffer ();
       syms_of_bytecode ();
       syms_of_callint ();

@@ -907,6 +885,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
       syms_of_data ();
 #ifdef DEBUG_XEMACS
       syms_of_debug ();
       syms_of_data ();
 #ifdef DEBUG_XEMACS
       syms_of_debug ();

+      syms_of_tests ();

 #endif /* DEBUG_XEMACS */
       syms_of_device ();
 #ifdef HAVE_DIALOGS
 #endif /* DEBUG_XEMACS */
       syms_of_device ();
 #ifdef HAVE_DIALOGS

@@ -940,9 +919,8 @@ main_1 (int argc, char **argv, char **envp, int restart)
       syms_of_glyphs ();
       syms_of_glyphs_eimage ();
       syms_of_glyphs_widget ();
       syms_of_glyphs ();
       syms_of_glyphs_eimage ();
       syms_of_glyphs_widget ();

-#if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)

       syms_of_gui ();
       syms_of_gui ();

-#endif
+      syms_of_gutter ();

       syms_of_indent ();
       syms_of_intl ();
       syms_of_keymap ();
       syms_of_indent ();
       syms_of_intl ();
       syms_of_keymap ();

@@ -998,6 +976,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
 #endif
 
 #ifdef HAVE_X_WINDOWS
 #endif
 
 #ifdef HAVE_X_WINDOWS

+      syms_of_balloon_x ();

       syms_of_device_x ();
 #ifdef HAVE_DIALOGS
       syms_of_dialog_x ();
       syms_of_device_x ();
 #ifdef HAVE_DIALOGS
       syms_of_dialog_x ();

@@ -1008,10 +987,15 @@ main_1 (int argc, char **argv, char **envp, int restart)
 #ifdef HAVE_MENUBARS
       syms_of_menubar_x ();
 #endif
 #ifdef HAVE_MENUBARS
       syms_of_menubar_x ();
 #endif

-      syms_of_xselect ();
+      syms_of_select_x ();

 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
       syms_of_gui_x ();
 #endif
 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
       syms_of_gui_x ();
 #endif

+#ifdef HAVE_XIM
+#ifdef XIM_XLIB
+      syms_of_input_method_xlib ();
+#endif
+#endif /* HAVE_XIM */

 #endif /* HAVE_X_WINDOWS */
 
 #ifdef HAVE_MS_WINDOWS
 #endif /* HAVE_X_WINDOWS */
 
 #ifdef HAVE_MS_WINDOWS

@@ -1021,6 +1005,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
       syms_of_objects_mswindows ();
       syms_of_select_mswindows ();
       syms_of_glyphs_mswindows ();
       syms_of_objects_mswindows ();
       syms_of_select_mswindows ();
       syms_of_glyphs_mswindows ();

+      syms_of_gui_mswindows ();

 #ifdef HAVE_MENUBARS
       syms_of_menubar_mswindows ();
 #endif
 #ifdef HAVE_MENUBARS
       syms_of_menubar_mswindows ();
 #endif

@@ -1082,6 +1067,14 @@ main_1 (int argc, char **argv, char **envp, int restart)
       syms_of_eldap ();
 #endif
 
       syms_of_eldap ();
 #endif
 

+#ifdef HAVE_GPM
+         syms_of_gpmevent ();
+#endif
+
+#ifdef HAVE_POSTGRESQL
+      syms_of_postgresql ();
+#endif
+

       /* Now create the subtypes for the types that have them.
         We do this before the vars_*() because more symbols
         may get initialized here. */
       /* Now create the subtypes for the types that have them.
         We do this before the vars_*() because more symbols
         may get initialized here. */

@@ -1165,6 +1158,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
       specifier_type_create ();
 
       specifier_type_create_image ();
       specifier_type_create ();
 
       specifier_type_create_image ();

+      specifier_type_create_gutter ();

       specifier_type_create_objects ();
 #ifdef HAVE_TOOLBARS
       specifier_type_create_toolbar ();
       specifier_type_create_objects ();
 #ifdef HAVE_TOOLBARS
       specifier_type_create_toolbar ();

@@ -1200,6 +1194,9 @@ main_1 (int argc, char **argv, char **envp, int restart)
       image_instantiator_format_create ();
       image_instantiator_format_create_glyphs_eimage ();
       image_instantiator_format_create_glyphs_widget ();
       image_instantiator_format_create ();
       image_instantiator_format_create_glyphs_eimage ();
       image_instantiator_format_create_glyphs_widget ();

+#ifdef HAVE_TTY
+      image_instantiator_format_create_glyphs_tty ();
+#endif

 #ifdef HAVE_X_WINDOWS
       image_instantiator_format_create_glyphs_x ();
 #endif /* HAVE_X_WINDOWS */
 #ifdef HAVE_X_WINDOWS
       image_instantiator_format_create_glyphs_x ();
 #endif /* HAVE_X_WINDOWS */

@@ -1248,7 +1245,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
         staticpro()
         Fprovide(symbol)
         intern()
         staticpro()
         Fprovide(symbol)
         intern()

-        pure_put()
+        Fput()

         xmalloc()
         defsymbol(), if it's absolutely necessary and you're sure that
           the symbol isn't referenced anywhere else in the initialization
         xmalloc()
         defsymbol(), if it's absolutely necessary and you're sure that
           the symbol isn't referenced anywhere else in the initialization

@@ -1258,10 +1255,9 @@ main_1 (int argc, char **argv, char **envp, int restart)
         using a global variable that has been initialized
           earlier on in the same function
 
         using a global variable that has been initialized
           earlier on in the same function
 

-        Any of the object-creating functions on alloc.c: e.g.
+        Any of the object-creating functions in alloc.c: e.g.

 
         make_pure_*()
 
         make_pure_*()

-        Fpurecopy()

         make_string()
         build_string()
         make_vector()
         make_string()
         build_string()
         make_vector()

@@ -1271,7 +1267,6 @@ main_1 (int argc, char **argv, char **envp, int restart)
         Fcons()
         listN()
         make_opaque_ptr()
         Fcons()
         listN()
         make_opaque_ptr()

-        make_opaque_long()

 
         perhaps a few others.
        */
 
         perhaps a few others.
        */

@@ -1279,11 +1274,11 @@ main_1 (int argc, char **argv, char **envp, int restart)
       /* Now allow Fprovide() statements to be made. */
       init_provide_once ();
 
       /* Now allow Fprovide() statements to be made. */
       init_provide_once ();
 

+      /* Do that before any specifier creation (esp. vars_of_glyphs()) */
+      vars_of_specifier ();
+

       vars_of_abbrev ();
       vars_of_alloc ();
       vars_of_abbrev ();
       vars_of_alloc ();

-#ifdef HAVE_X_WINDOWS
-      vars_of_balloon_x ();
-#endif

       vars_of_buffer ();
       vars_of_bytecode ();
       vars_of_callint ();
       vars_of_buffer ();
       vars_of_bytecode ();
       vars_of_callint ();

@@ -1295,6 +1290,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
       vars_of_data ();
 #ifdef DEBUG_XEMACS
       vars_of_debug ();
       vars_of_data ();
 #ifdef DEBUG_XEMACS
       vars_of_debug ();

+      vars_of_tests ();

 #endif
       vars_of_console_stream ();
       vars_of_device ();
 #endif
       vars_of_console_stream ();
       vars_of_device ();

@@ -1332,9 +1328,8 @@ main_1 (int argc, char **argv, char **envp, int restart)
       vars_of_glyphs ();
       vars_of_glyphs_eimage ();
       vars_of_glyphs_widget ();
       vars_of_glyphs ();
       vars_of_glyphs_eimage ();
       vars_of_glyphs_widget ();

-#if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)

       vars_of_gui ();
       vars_of_gui ();

-#endif
+      vars_of_gutter ();

       vars_of_indent ();
       vars_of_insdel ();
       vars_of_intl ();
       vars_of_indent ();
       vars_of_insdel ();
       vars_of_intl ();

@@ -1361,6 +1356,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
       vars_of_module ();
 #endif
 #ifdef WINDOWSNT
       vars_of_module ();
 #endif
 #ifdef WINDOWSNT

+      vars_of_nt ();

       vars_of_ntproc ();
 #endif
       vars_of_objects ();
       vars_of_ntproc ();
 #endif
       vars_of_objects ();

@@ -1387,7 +1383,6 @@ main_1 (int argc, char **argv, char **envp, int restart)
       vars_of_search ();
       vars_of_select ();
       vars_of_sound ();
       vars_of_search ();
       vars_of_select ();
       vars_of_sound ();

-      vars_of_specifier ();

       vars_of_symbols ();
       vars_of_syntax ();
 #ifdef HAVE_TOOLBARS
       vars_of_symbols ();
       vars_of_syntax ();
 #ifdef HAVE_TOOLBARS

@@ -1403,6 +1398,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
 #endif
 
 #ifdef HAVE_X_WINDOWS
 #endif
 
 #ifdef HAVE_X_WINDOWS

+      vars_of_balloon_x ();

       vars_of_device_x ();
 #ifdef HAVE_DIALOGS
       vars_of_dialog_x ();
       vars_of_device_x ();
 #ifdef HAVE_DIALOGS
       vars_of_dialog_x ();

@@ -1413,14 +1409,14 @@ main_1 (int argc, char **argv, char **envp, int restart)
       vars_of_menubar_x ();
 #endif
       vars_of_objects_x ();
       vars_of_menubar_x ();
 #endif
       vars_of_objects_x ();

-      vars_of_xselect ();
+      vars_of_select_x ();

 #ifdef HAVE_SCROLLBARS
       vars_of_scrollbar_x ();
 #endif
 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
       vars_of_gui_x ();
 #endif
 #ifdef HAVE_SCROLLBARS
       vars_of_scrollbar_x ();
 #endif
 #if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
       vars_of_gui_x ();
 #endif

-#endif
+#endif /* HAVE_X_WINDOWS */

 
 #ifdef HAVE_MS_WINDOWS
       vars_of_device_mswindows ();
 
 #ifdef HAVE_MS_WINDOWS
       vars_of_device_mswindows ();

@@ -1472,6 +1468,14 @@ main_1 (int argc, char **argv, char **envp, int restart)
       vars_of_eldap ();
 #endif
 
       vars_of_eldap ();
 #endif
 

+#ifdef HAVE_POSTGRESQL
+      vars_of_postgresql();
+#endif
+
+#ifdef HAVE_GPM
+         vars_of_gpmevent ();
+#endif
+

       /* Now initialize any specifier variables.  We do this later
         because it has some dependence on the vars initialized
         above.
       /* Now initialize any specifier variables.  We do this later
         because it has some dependence on the vars initialized
         above.

@@ -1487,6 +1491,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
         */
 
       specifier_vars_of_glyphs ();
         */
 
       specifier_vars_of_glyphs ();

+      specifier_vars_of_gutter ();

 #ifdef HAVE_MENUBARS
       specifier_vars_of_menubar ();
 #endif
 #ifdef HAVE_MENUBARS
       specifier_vars_of_menubar ();
 #endif

@@ -1520,7 +1525,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
         earlier.  The second may also depend on the first. */
       complex_vars_of_mule_charset ();
 #endif
         earlier.  The second may also depend on the first. */
       complex_vars_of_mule_charset ();
 #endif

-#if defined(FILE_CODING)
+#ifdef FILE_CODING

       complex_vars_of_file_coding ();
 #endif
 
       complex_vars_of_file_coding ();
 #endif
 

@@ -1602,8 +1607,119 @@ main_1 (int argc, char **argv, char **envp, int restart)
          garbage_collect_1 ();
       }
 #endif
          garbage_collect_1 ();
       }
 #endif

+#ifdef PDUMP
+    } else if (!restart) {
+      reinit_alloc_once_early ();
+      reinit_symbols_once_early ();
+      reinit_opaque_once_early ();
+
+      reinit_console_type_create_stream ();
+#ifdef HAVE_TTY
+      reinit_console_type_create_tty ();
+#endif
+#ifdef HAVE_X_WINDOWS
+      reinit_console_type_create_x ();
+      reinit_console_type_create_device_x ();
+#endif
+#ifdef HAVE_MS_WINDOWS
+      reinit_console_type_create_mswindows ();
+#endif
+
+      reinit_specifier_type_create ();
+      reinit_specifier_type_create_image ();
+      reinit_specifier_type_create_gutter ();
+      reinit_specifier_type_create_objects ();
+#ifdef HAVE_TOOLBARS
+      reinit_specifier_type_create_toolbar ();
+#endif
+
+      structure_type_create ();
+
+      structure_type_create_chartab ();
+      structure_type_create_faces ();
+      structure_type_create_rangetab ();
+      structure_type_create_hash_table ();
+
+      lstream_type_create ();
+#ifdef FILE_CODING
+      lstream_type_create_file_coding ();
+#endif
+#if defined (HAVE_MS_WINDOWS) && !defined(HAVE_MSG_SELECT)
+      lstream_type_create_mswindows_selectable ();
+#endif
+#ifdef HAVE_UNIX_PROCESSES
+      process_type_create_unix ();
+#endif
+#ifdef HAVE_WIN32_PROCESSES
+      process_type_create_nt ();
+#endif
+
+      reinit_vars_of_buffer ();
+      reinit_vars_of_console ();
+#ifdef DEBUG_XEMACS
+      reinit_vars_of_debug ();
+#endif
+      reinit_vars_of_device ();
+      reinit_vars_of_eval ();
+#ifdef HAVE_X_WINDOWS
+      reinit_vars_of_event_Xt ();
+#endif
+#if defined(HAVE_TTY) && (defined (DEBUG_TTY_EVENT_STREAM) || !defined (HAVE_X_WINDOWS))
+      reinit_vars_of_event_tty ();
+#endif
+#ifdef HAVE_MS_WINDOWS
+      reinit_vars_of_event_mswindows ();
+#endif
+      reinit_vars_of_event_stream ();
+      reinit_vars_of_events ();
+      reinit_vars_of_extents ();
+      reinit_vars_of_fileio ();
+      reinit_vars_of_font_lock ();
+      reinit_vars_of_glyphs ();
+      reinit_vars_of_glyphs_widget ();
+      reinit_vars_of_insdel ();
+      reinit_vars_of_lread ();
+      reinit_vars_of_lstream ();
+      reinit_vars_of_minibuf ();
+#ifdef HAVE_SHLIB
+      reinit_vars_of_module ();
+#endif
+      reinit_vars_of_objects ();
+      reinit_vars_of_print ();
+      reinit_vars_of_redisplay ();
+      reinit_vars_of_search ();
+      reinit_vars_of_undo ();
+      reinit_vars_of_window ();
+
+#ifdef HAVE_MS_WINDOWS
+      reinit_vars_of_frame_mswindows ();
+#endif
+
+#ifdef HAVE_X_WINDOWS
+      reinit_vars_of_device_x ();
+#ifdef HAVE_SCROLLBARS
+      reinit_vars_of_scrollbar_x ();
+#endif
+#ifdef HAVE_MENUBARS
+      reinit_vars_of_menubar_x ();
+#endif
+      reinit_vars_of_select_x ();
+#if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
+      reinit_vars_of_gui_x ();
+#endif
+#endif /* HAVE_X_WINDOWS */
+
+#if defined(MULE) && defined(HAVE_WNN)
+      reinit_vars_of_mule_wnn ();
+#endif
+
+      reinit_complex_vars_of_buffer ();
+      reinit_complex_vars_of_console ();
+      reinit_complex_vars_of_minibuf ();
+#endif /* PDUMP */

     }
 
     }
 

+

   /* CONGRATULATIONS!!!  We have successfully initialized the Lisp
      engine. */
 
   /* CONGRATULATIONS!!!  We have successfully initialized the Lisp
      engine. */
 

@@ -1658,6 +1774,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
 
   init_redisplay ();      /* Determine terminal type.
                             init_sys_modes uses results */
 
   init_redisplay ();      /* Determine terminal type.
                             init_sys_modes uses results */

+  init_frame ();

   init_event_stream (); /* Set up so we can get user input. */
   init_macros (); /* set up so we can run macros. */
   init_editfns (); /* Determine the name of the user we're running as */
   init_event_stream (); /* Set up so we can get user input. */
   init_macros (); /* set up so we can run macros. */
   init_editfns (); /* Determine the name of the user we're running as */

@@ -1671,7 +1788,7 @@ main_1 (int argc, char **argv, char **envp, int restart)
 #ifdef HAVE_TTY
   init_device_tty ();
 #endif
 #ifdef HAVE_TTY
   init_device_tty ();
 #endif

-  init_console_stream (); /* Create the first console */
+  init_console_stream (restart); /* Create the first console */

 
   /* try to get the actual pathname of the exec file we are running */
   if (!restart)
 
   /* try to get the actual pathname of the exec file we are running */
   if (!restart)

@@ -1765,17 +1882,18 @@ main_1 (int argc, char **argv, char **envp, int restart)
 
 struct standard_args
 {
 
 struct standard_args
 {

-  CONST char * CONST name;
-  CONST char * CONST longname;
+  const char *name;
+  const char *longname;

   int priority;
   int nargs;
 };
 
   int priority;
   int nargs;
 };
 

-static struct standard_args standard_args[] =
+static const struct standard_args standard_args[] =

 {
   /* Handled by main_1 above: */
 {
   /* Handled by main_1 above: */

-  { "-nl", "--no-shared-memory", 100, 0 },
-  { "-t", "--terminal", 95, 1 },
+  { "-sd", "--show-dump-id", 105, 0 },
+  { "-t", "--terminal", 100, 1 },
+  { "-nd", "--no-dump-file", 95, 0 },

   { "-nw", "--no-windows", 90, 0 },
   { "-batch", "--batch", 85, 0 },
   { "-debug-paths", "--debug-paths", 82, 0 },
   { "-nw", "--no-windows", 90, 0 },
   { "-batch", "--batch", 85, 0 },
   { "-debug-paths", "--debug-paths", 82, 0 },

@@ -1970,14 +2088,6 @@ sort_args (int argc, char **argv)
   xfree (priority);
 }
 
   xfree (priority);
 }
 

-static JMP_BUF run_temacs_catch;
-
-static int run_temacs_argc;
-static char **run_temacs_argv;
-static char *run_temacs_args;
-static size_t run_temacs_argv_size;
-static size_t run_temacs_args_size;
-

 DEFUN ("running-temacs-p", Frunning_temacs_p, 0, 0, 0, /*
 True if running temacs.  This means we are in the dumping stage.
 This is false during normal execution of the `xemacs' program, and
 DEFUN ("running-temacs-p", Frunning_temacs_p, 0, 0, 0, /*
 True if running temacs.  This means we are in the dumping stage.
 This is false during normal execution of the `xemacs' program, and

@@ -2005,11 +2115,11 @@ Do not call this.  It will reinitialize your XEmacs.  You'll be sorry.
      (int nargs, Lisp_Object *args))
 {
   int ac;
      (int nargs, Lisp_Object *args))
 {
   int ac;

-  CONST Extbyte *wampum;
+  const Extbyte *wampum;

   int namesize;
   int total_len;
   Lisp_Object orig_invoc_name = Fcar (Vcommand_line_args);
   int namesize;
   int total_len;
   Lisp_Object orig_invoc_name = Fcar (Vcommand_line_args);

-  CONST Extbyte **wampum_all = alloca_array (CONST Extbyte *, nargs);
+  const Extbyte **wampum_all = alloca_array (const Extbyte *, nargs);

   int *wampum_all_len  = alloca_array (int, nargs);
 
   assert (!gc_in_progress);
   int *wampum_all_len  = alloca_array (int, nargs);
 
   assert (!gc_in_progress);

@@ -2020,16 +2130,17 @@ Do not call this.  It will reinitialize your XEmacs.  You'll be sorry.
   /* Need to convert the orig_invoc_name and all of the arguments
      to external format. */
 
   /* Need to convert the orig_invoc_name and all of the arguments
      to external format. */
 

-  GET_STRING_EXT_DATA_ALLOCA (orig_invoc_name, FORMAT_OS, wampum,
-                             namesize);
+  TO_EXTERNAL_FORMAT (LISP_STRING, orig_invoc_name,
+                     ALLOCA, (wampum, namesize),
+                     Qnative);

   namesize++;
 
   for (ac = 0, total_len = namesize; ac < nargs; ac++)
     {
       CHECK_STRING (args[ac]);
   namesize++;
 
   for (ac = 0, total_len = namesize; ac < nargs; ac++)
     {
       CHECK_STRING (args[ac]);

-      GET_STRING_EXT_DATA_ALLOCA (args[ac], FORMAT_OS,
-                                 wampum_all[ac],
-                                 wampum_all_len[ac]);
+      TO_EXTERNAL_FORMAT (LISP_STRING, args[ac],
+                         ALLOCA, (wampum_all[ac], wampum_all_len[ac]),
+                         Qnative);

       wampum_all_len[ac]++;
       total_len += wampum_all_len[ac];
     }
       wampum_all_len[ac]++;
       total_len += wampum_all_len[ac];
     }

@@ -2051,7 +2162,7 @@ Do not call this.  It will reinitialize your XEmacs.  You'll be sorry.
   unbind_to (0, Qnil); /* this closes loadup.el */
   purify_flag = 0;
   run_temacs_argc = nargs + 1;
   unbind_to (0, Qnil); /* this closes loadup.el */
   purify_flag = 0;
   run_temacs_argc = nargs + 1;

-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)

   report_sheap_usage (0);
 #endif
   LONGJMP (run_temacs_catch, 1);
   report_sheap_usage (0);
 #endif
   LONGJMP (run_temacs_catch, 1);

@@ -2157,7 +2268,7 @@ main (int argc, char **argv, char **envp)
       int rc = malloc_set_state (malloc_state_ptr);
       if (rc != 0)
        {
       int rc = malloc_set_state (malloc_state_ptr);
       if (rc != 0)
        {

-         fprintf (stderr, "malloc_set_state failed, rc = %d\n", rc);
+         stderr_out ("malloc_set_state failed, rc = %d\n", rc);

          abort ();
        }
 #if 0
          abort ();
        }
 #if 0

@@ -2193,9 +2304,13 @@ voodoo_free_hook (void *mem)
 {
   /* Disable all calls to free() when XEmacs is exiting and it doesn't */
   /* matter. */
 {
   /* Disable all calls to free() when XEmacs is exiting and it doesn't */
   /* matter. */

-  __free_hook = voodoo_free_hook;
-}
+  __free_hook =
+#ifdef __GNUC__ /* prototype of __free_hook varies with glibc version */
+    (__typeof__ (__free_hook))

 #endif
 #endif

+    voodoo_free_hook;
+}
+#endif /* GNU_MALLOC */

 
 DEFUN ("kill-emacs", Fkill_emacs, 0, 1, "P", /*
 Exit the XEmacs job and kill it.  Ask for confirmation, without argument.
 
 DEFUN ("kill-emacs", Fkill_emacs, 0, 1, "P", /*
 Exit the XEmacs job and kill it.  Ask for confirmation, without argument.

@@ -2249,13 +2364,17 @@ all of which are called before XEmacs is actually killed.
 
   UNGCPRO;
 
 
   UNGCPRO;
 

-  shut_down_emacs (0, ((STRINGP (arg)) ? arg : Qnil));
+  shut_down_emacs (0, STRINGP (arg) ? arg : Qnil);

 
 #if defined(GNU_MALLOC)
 
 #if defined(GNU_MALLOC)

-  __free_hook = voodoo_free_hook;
+  __free_hook =
+#ifdef __GNUC__ /* prototype of __free_hook varies with glibc version */
+    (__typeof__ (__free_hook))
+#endif
+    voodoo_free_hook;

 #endif
 
 #endif
 

-  exit ((INTP (arg)) ? XINT (arg) : 0);
+  exit (INTP (arg) ? XINT (arg) : 0);

   /* NOTREACHED */
   return Qnil; /* I'm sick of the compiler warning */
 }
   /* NOTREACHED */
   return Qnil; /* I'm sick of the compiler warning */
 }

@@ -2311,12 +2430,16 @@ shut_down_emacs (int sig, Lisp_Object stuff)
        ("Your files have been auto-saved.\n"
         "Use `M-x recover-session' to recover them.\n"
         "\n"
        ("Your files have been auto-saved.\n"
         "Use `M-x recover-session' to recover them.\n"
         "\n"

+         "If you have access to the PROBLEMS file that came with your\n"
+         "version of XEmacs, please check to see if your crash is described\n"
+         "there, as there may be a workaround available.\n"

 #ifdef INFODOCK
 #ifdef INFODOCK

-        "Please report this bug by selecting `Report-Bug' in the InfoDock\n"
-        "menu.\n"
+        "Otherwise, please report this bug by selecting `Report-Bug'\n"
+         "in the InfoDock menu.\n"

 #else
 #else

-        "Please report this bug by running the send-pr script included\n"
-        "with XEmacs, or selecting `Send Bug Report' from the help menu.\n"
+        "Otherwise, please report this bug by running the send-pr\n"
+         "script included with XEmacs, or selecting `Send Bug Report'\n"
+         "from the help menu.\n"

         "As a last resort send ordinary email to `crashes@xemacs.org'.\n"
 #endif
         "*MAKE SURE* to include the information in the command\n"
         "As a last resort send ordinary email to `crashes@xemacs.org'.\n"
 #endif
         "*MAKE SURE* to include the information in the command\n"

@@ -2331,17 +2454,17 @@ shut_down_emacs (int sig, Lisp_Object stuff)
         "\n"
         "  gdb ");
       {
         "\n"
         "  gdb ");
       {

-       CONST char *name;
+       const char *name;

        char *dir = 0;
 
        /* Now try to determine the actual path to the executable,
           to try to make the backtrace-determination process as foolproof
           as possible. */
        char *dir = 0;
 
        /* Now try to determine the actual path to the executable,
           to try to make the backtrace-determination process as foolproof
           as possible. */

-       if (GC_STRINGP (Vinvocation_name))
+       if (STRINGP (Vinvocation_name))

          name = (char *) XSTRING_DATA (Vinvocation_name);
        else
          name = "xemacs";
          name = (char *) XSTRING_DATA (Vinvocation_name);
        else
          name = "xemacs";

-       if (GC_STRINGP (Vinvocation_directory))
+       if (STRINGP (Vinvocation_directory))

          dir = (char *) XSTRING_DATA (Vinvocation_directory);
        if (!dir || dir[0] != '/')
          stderr_out ("`which %s`", name);
          dir = (char *) XSTRING_DATA (Vinvocation_directory);
        if (!dir || dir[0] != '/')
          stderr_out ("`which %s`", name);

@@ -2378,50 +2501,11 @@ shut_down_emacs (int sig, Lisp_Object stuff)
 
 \f
 #ifndef CANNOT_DUMP
 
 \f
 #ifndef CANNOT_DUMP

-/* Nothing like this can be implemented on an Apollo.
-   What a loss!  */

 
 

+#if !defined(PDUMP) || !defined(SYSTEM_MALLOC)

 extern char my_edata[];
 extern char my_edata[];

-
-#ifdef HAVE_SHM
-
-DEFUN ("dump-emacs-data", Fdump_emacs_data, 1, 1, 0, /*
-Dump current state of XEmacs into data file FILENAME.
-This function exists on systems that use HAVE_SHM.
-*/
-       (intoname))
-{
-  /* This function can GC */
-  int opurify;
-  struct gcpro gcpro1;
-  GCPRO1 (intoname);
-
-  CHECK_STRING (intoname);
-  intoname = Fexpand_file_name (intoname, Qnil);
-
-  opurify = purify_flag;
-  purify_flag = 0;
-
-  fflush (stderr);
-  fflush (stdout);
-
-  disksave_object_finalization ();
-  release_breathing_space ();
-
-  /* Tell malloc where start of impure now is */
-  /* Also arrange for warnings when nearly out of space.  */
-#ifndef SYSTEM_MALLOC
-  memory_warnings (my_edata, malloc_warning);

 #endif
 #endif

-  UNGCPRO;
-  map_out_data (XSTRING_DATA (intoname));
-
-  purify_flag = opurify;

 
 

-  return Qnil;
-}
-
-#else /* not HAVE_SHM */

 extern void disable_free_hook (void);
 
 DEFUN ("dump-emacs", Fdump_emacs, 2, 2, 0, /*
 extern void disable_free_hook (void);
 
 DEFUN ("dump-emacs", Fdump_emacs, 2, 2, 0, /*

@@ -2462,10 +2546,12 @@ and announce itself normally when it is run.
   opurify = purify_flag;
   purify_flag = 0;
 
   opurify = purify_flag;
   purify_flag = 0;
 

-#ifdef HEAP_IN_DATA
+#if defined (HEAP_IN_DATA) && !defined(PDUMP)

   report_sheap_usage (1);
 #endif
 
   report_sheap_usage (1);
 #endif
 

+  clear_message ();
+

   fflush (stderr);
   fflush (stdout);
 
   fflush (stderr);
   fflush (stdout);
 

@@ -2496,13 +2582,23 @@ and announce itself normally when it is run.
     char *intoname_ext;
     char *symname_ext;
 
     char *intoname_ext;
     char *symname_ext;
 

-    GET_C_STRING_FILENAME_DATA_ALLOCA (intoname, intoname_ext);
+    TO_EXTERNAL_FORMAT (LISP_STRING, intoname,
+                       C_STRING_ALLOCA, intoname_ext,
+                       Qfile_name);
+

     if (STRINGP (symname))
     if (STRINGP (symname))

-      GET_C_STRING_FILENAME_DATA_ALLOCA (symname, symname_ext);
+      TO_EXTERNAL_FORMAT (LISP_STRING, symname,
+                         C_STRING_ALLOCA, symname_ext,
+                         Qfile_name);

     else
       symname_ext = 0;
 
     garbage_collect_1 ();
     else
       symname_ext = 0;
 
     garbage_collect_1 ();

+
+#ifdef PDUMP
+    pdump ();
+#else
+

 #ifdef DOUG_LEA_MALLOC
     malloc_state_ptr = malloc_get_state ();
 #endif
 #ifdef DOUG_LEA_MALLOC
     malloc_state_ptr = malloc_get_state ();
 #endif

@@ -2516,6 +2612,7 @@ and announce itself normally when it is run.
 #ifdef DOUG_LEA_MALLOC
     free (malloc_state_ptr);
 #endif
 #ifdef DOUG_LEA_MALLOC
     free (malloc_state_ptr);
 #endif

+#endif /* not PDUMP */

   }
 #endif /* not MSDOS and EMX */
 
   }
 #endif /* not MSDOS and EMX */
 

@@ -2524,26 +2621,21 @@ and announce itself normally when it is run.
   return Qnil;
 }
 
   return Qnil;
 }
 

-#endif /* not HAVE_SHM */
-

 #endif /* not CANNOT_DUMP */
 \f
 #endif /* not CANNOT_DUMP */
 \f

-#ifndef SEPCHAR
-#define SEPCHAR ':'
-#endif

 
 /* Split STRING into a list of substrings.  The substrings are the
    parts of original STRING separated by SEPCHAR.  */
 static Lisp_Object
 
 /* Split STRING into a list of substrings.  The substrings are the
    parts of original STRING separated by SEPCHAR.  */
 static Lisp_Object

-split_string_by_emchar_1 (CONST Bufbyte *string, Bytecount size,
+split_string_by_emchar_1 (const Bufbyte *string, Bytecount size,

                          Emchar sepchar)
 {
   Lisp_Object result = Qnil;
                          Emchar sepchar)
 {
   Lisp_Object result = Qnil;

-  CONST Bufbyte *end = string + size;
+  const Bufbyte *end = string + size;

 
   while (1)
     {
 
   while (1)
     {

-      CONST Bufbyte *p = string;
+      const Bufbyte *p = string;

       while (p < end)
        {
          if (charptr_emchar (p) == sepchar)
       while (p < end)
        {
          if (charptr_emchar (p) == sepchar)

@@ -2563,33 +2655,32 @@ split_string_by_emchar_1 (CONST Bufbyte *string, Bytecount size,
 }
 
 /* The same as the above, except PATH is an external C string (it is
 }
 
 /* The same as the above, except PATH is an external C string (it is

-   converted as FORMAT_FILENAME), and sepchar is hardcoded to SEPCHAR
+   converted using Qfile_name), and sepchar is hardcoded to SEPCHAR

    (':' or whatever).  */
 Lisp_Object
    (':' or whatever).  */
 Lisp_Object

-decode_path (CONST char *path)
+decode_path (const char *path)

 {
 {

-  int len;
+  Bytecount newlen;

   Bufbyte *newpath;
   if (!path)
     return Qnil;
 
   Bufbyte *newpath;
   if (!path)
     return Qnil;
 

-  GET_C_CHARPTR_INT_FILENAME_DATA_ALLOCA (path, newpath);
+  TO_INTERNAL_FORMAT (C_STRING, path, ALLOCA, (newpath, newlen), Qfile_name);

 
 

-  len = strlen ((const char *) newpath);

   /* #### Does this make sense?  It certainly does for
      decode_env_path(), but it looks dubious here.  Does any code
      depend on decode_path("") returning nil instead of an empty
      string?  */
   /* #### Does this make sense?  It certainly does for
      decode_env_path(), but it looks dubious here.  Does any code
      depend on decode_path("") returning nil instead of an empty
      string?  */

-  if (!len)
+  if (!newlen)

     return Qnil;
 
     return Qnil;
 

-  return split_string_by_emchar_1 (newpath, (Bytecount)len, SEPCHAR);
+  return split_string_by_emchar_1 (newpath, newlen, SEPCHAR);

 }
 
 Lisp_Object
 }
 
 Lisp_Object

-decode_env_path (CONST char *evarname, CONST char *default_)
+decode_env_path (const char *evarname, const char *default_)

 {
 {

-  CONST char *path = 0;
+  const char *path = 0;

   if (evarname)
     path = egetenv (evarname);
   if (!path)
   if (evarname)
     path = egetenv (evarname);
   if (!path)

@@ -2652,7 +2743,7 @@ Non-nil return value means XEmacs is running without interactive terminal.
 /* This highly dubious kludge ... shut up Jamie, I'm tired of your slagging. */
 
 DOESNT_RETURN
 /* This highly dubious kludge ... shut up Jamie, I'm tired of your slagging. */
 
 DOESNT_RETURN

-assert_failed (CONST char *file, int line, CONST char *expr)
+assert_failed (const char *file, int line, const char *expr)

 {
   stderr_out ("Fatal error: assertion failed, file %s, line %d, %s\n",
              file, line, expr);
 {
   stderr_out ("Fatal error: assertion failed, file %s, line %d, %s\n",
              file, line, expr);

@@ -2700,11 +2791,7 @@ void
 syms_of_emacs (void)
 {
 #ifndef CANNOT_DUMP
 syms_of_emacs (void)
 {
 #ifndef CANNOT_DUMP

-#ifdef HAVE_SHM
-  DEFSUBR (Fdump_emacs_data);
-#else

   DEFSUBR (Fdump_emacs);
   DEFSUBR (Fdump_emacs);

-#endif

 #endif /* !CANNOT_DUMP */
 
   DEFSUBR (Frun_emacs_from_temacs);
 #endif /* !CANNOT_DUMP */
 
   DEFSUBR (Frun_emacs_from_temacs);

@@ -2775,7 +2862,7 @@ Symbol indicating type of operating system you are using.
   DEFVAR_LISP ("system-configuration", &Vsystem_configuration /*
 String naming the configuration XEmacs was built for.
 */ );
   DEFVAR_LISP ("system-configuration", &Vsystem_configuration /*
 String naming the configuration XEmacs was built for.
 */ );

-  Vsystem_configuration = Fpurecopy (build_string (EMACS_CONFIGURATION));
+  Vsystem_configuration = build_string (EMACS_CONFIGURATION);

 
 #ifndef EMACS_CONFIG_OPTIONS
 # define EMACS_CONFIG_OPTIONS "UNKNOWN"
 
 #ifndef EMACS_CONFIG_OPTIONS
 # define EMACS_CONFIG_OPTIONS "UNKNOWN"

@@ -2783,8 +2870,7 @@ String naming the configuration XEmacs was built for.
   DEFVAR_LISP ("system-configuration-options", &Vsystem_configuration_options /*
 String containing the configuration options XEmacs was built with.
 */ );
   DEFVAR_LISP ("system-configuration-options", &Vsystem_configuration_options /*
 String containing the configuration options XEmacs was built with.
 */ );

-  Vsystem_configuration_options = Fpurecopy (build_string
-                                            (EMACS_CONFIG_OPTIONS));
+  Vsystem_configuration_options = build_string (EMACS_CONFIG_OPTIONS);

 
   DEFVAR_LISP ("emacs-major-version", &Vemacs_major_version /*
 Major version number of this version of Emacs, as an integer.
 
   DEFVAR_LISP ("emacs-major-version", &Vemacs_major_version /*
 Major version number of this version of Emacs, as an integer.

@@ -2850,7 +2936,7 @@ Codename of this version of Emacs (a string).
 #ifndef XEMACS_CODENAME
 #define XEMACS_CODENAME "Noname"
 #endif
 #ifndef XEMACS_CODENAME
 #define XEMACS_CODENAME "Noname"
 #endif

-  Vxemacs_codename = Fpurecopy (build_string (XEMACS_CODENAME));
+  Vxemacs_codename = build_string (XEMACS_CODENAME);

 
   DEFVAR_BOOL ("noninteractive", &noninteractive1 /*
 Non-nil means XEmacs is running without interactive terminal.
 
   DEFVAR_BOOL ("noninteractive", &noninteractive1 /*
 Non-nil means XEmacs is running without interactive terminal.

@@ -2902,6 +2988,8 @@ typecheck - check types strictly, aborting in case of error;
 malloc         - check operation of malloc;
 gc             - check garbage collection;
 bufpos         - check buffer positions.
 malloc         - check operation of malloc;
 gc             - check garbage collection;
 bufpos         - check buffer positions.

+
+quick-build     - user has requested the "quick-build" configure option.

 */ );
   Vinternal_error_checking = Qnil;
 #ifdef ERROR_CHECK_EXTENTS
 */ );
   Vinternal_error_checking = Qnil;
 #ifdef ERROR_CHECK_EXTENTS

@@ -2924,7 +3012,50 @@ bufpos           - check buffer positions.
   Vinternal_error_checking = Fcons (intern ("bufpos"),
                                    Vinternal_error_checking);
 #endif
   Vinternal_error_checking = Fcons (intern ("bufpos"),
                                    Vinternal_error_checking);
 #endif

-  Vinternal_error_checking = Fpurecopy (Vinternal_error_checking);
+#ifdef QUICK_BUILD
+  Vinternal_error_checking = Fcons (intern ("quick-build"),
+                                   Vinternal_error_checking);
+#endif
+
+  DEFVAR_CONST_LISP ("mail-lock-methods", &Vmail_lock_methods /*
+Mail spool locking methods supported by this instance of XEmacs.
+This is a list of symbols.  Each of the symbols is one of the
+following: dot, lockf, flock, locking, mmdf.
+*/ );
+  {
+    Vmail_lock_methods = Qnil;
+    Vmail_lock_methods = Fcons (intern ("dot"), Vmail_lock_methods);
+#ifdef HAVE_LOCKF
+    Vmail_lock_methods = Fcons (intern ("lockf"), Vmail_lock_methods);
+#endif
+#ifdef HAVE_FLOCK
+    Vmail_lock_methods = Fcons (intern ("flock"), Vmail_lock_methods);
+#endif
+#ifdef HAVE_MMDF
+    Vmail_lock_methods = Fcons (intern ("mmdf"), Vmail_lock_methods);
+#endif
+#ifdef HAVE_LOCKING
+    Vmail_lock_methods = Fcons (intern ("locking"), Vmail_lock_methods);
+#endif
+  }
+
+  DEFVAR_CONST_LISP ("configure-mail-lock-method", &Vconfigure_mail_lock_method /*
+Mail spool locking method suggested by configure.  This is one
+of the symbols in MAIL-LOCK-METHODS.
+*/ );
+  {
+#if defined(MAIL_LOCK_FLOCK) && defined(HAVE_FLOCK)
+    Vconfigure_mail_lock_method = intern("flock");
+#elif defined(MAIL_LOCK_LOCKF) && defined(HAVE_LOCKF)
+    Vconfigure_mail_lock_method = intern("lockf");
+#elif defined(MAIL_LOCK_MMDF) && defined(HAVE_MMDF)
+    Vconfigure_mail_lock_method = intern("mmdf");
+#elif defined(MAIL_LOCK_LOCKING) && defined(HAVE_LOCKING)
+    Vconfigure_mail_lock_method = intern("locking");
+#else
+    Vconfigure_mail_lock_method = intern("dot");
+#endif
+  }

 
   DEFVAR_LISP ("path-separator", &Vpath_separator /*
 The directory separator in search paths, as a string.
 
   DEFVAR_LISP ("path-separator", &Vpath_separator /*
 The directory separator in search paths, as a string.

@@ -3023,7 +3154,8 @@ configure's idea of what the package path will be.
 *Directory of architecture-independent files that come with XEmacs,
 intended for XEmacs to use.
 Use of this variable in new code is almost never correct.  See the
 *Directory of architecture-independent files that come with XEmacs,
 intended for XEmacs to use.
 Use of this variable in new code is almost never correct.  See the

-function `locate-data-directory' and the variable `data-directory-list'.
+functions `locate-data-file' and `locate-data-directory' and the variable
+`data-directory-list'.

 */ );
   Vdata_directory = Qnil;
 
 */ );
   Vdata_directory = Qnil;
 

@@ -3151,7 +3283,7 @@ The configured initial path for info documentation.
 #endif
 }
 
 #endif
 }
 

-#ifdef __sgi
+#if defined(__sgi) && !defined(PDUMP)

 /* This is so tremendously ugly I'd puke. But then, it works.
  * The target is to override the static constructor from the
  * libiflPNG.so library which is maskerading as libz, and
 /* This is so tremendously ugly I'd puke. But then, it works.
  * The target is to override the static constructor from the
  * libiflPNG.so library which is maskerading as libz, and