*** empty log message ***

[bpt/emacs.git] / src / emacs.c

diff --git a/src/emacs.c b/src/emacs.c
index 97c0b20..a943a07 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1,11 +1,11 @@
 /* Fully extensible Emacs, running on Unix, intended for GNU.
 /* Fully extensible Emacs, running on Unix, intended for GNU.

-   Copyright (C) 1985, 1986, 1987 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 1994 Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -21,7 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <signal.h>
 #include <errno.h>
 
 #include <signal.h>
 #include <errno.h>
 

-#include "config.h"
+#include <config.h>

 #include <stdio.h>
 
 #include <sys/types.h>
 #include <stdio.h>
 
 #include <sys/types.h>


@@ -31,10 +31,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <ssdef.h>
 #endif
 
 #include <ssdef.h>
 #endif
 

-#ifdef USG5
-#include <fcntl.h>
-#endif
-

 #ifdef BSD
 #include <sys/ioctl.h>
 #endif
 #ifdef BSD
 #include <sys/ioctl.h>
 #endif


@@ -45,31 +41,68 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #endif
 #endif
 
 #endif
 #endif
 

-#undef NULL

 #include "lisp.h"
 #include "commands.h"
 #include "lisp.h"
 #include "commands.h"

+#include "intervals.h"
+
+#include "systty.h"
+#include "syssignal.h"
+#include "process.h"

 
 #ifndef O_RDWR
 #define O_RDWR 2
 #endif
 
 
 #ifndef O_RDWR
 #define O_RDWR 2
 #endif
 

-#define PRIO_PROCESS 0
+extern void malloc_warning ();
+extern char *index ();
+extern char *strerror ();

 
 /* Command line args from shell, as list of strings */
 Lisp_Object Vcommand_line_args;
 
 
 /* Command line args from shell, as list of strings */
 Lisp_Object Vcommand_line_args;
 

+/* The name under which Emacs was invoked, with any leading directory
+   names discarded.  */
+Lisp_Object Vinvocation_name;
+
+/* The directory name from which Emacs was invoked.  */
+Lisp_Object Vinvocation_directory;
+
+/* The directory name in which to find subdirs such as lisp and etc.
+   nil means get them only from PATH_LOADSEARCH.  */
+Lisp_Object Vinstallation_directory;
+
+/* Hook run by `kill-emacs' before it does really anything.  */
+Lisp_Object Vkill_emacs_hook;
+

 /* Set nonzero after Emacs has started up the first time.
   Prevents reinitialization of the Lisp world and keymaps
   on subsequent starts.  */
 int initialized;
 
 /* Set nonzero after Emacs has started up the first time.
   Prevents reinitialization of the Lisp world and keymaps
   on subsequent starts.  */
 int initialized;
 

-/* Variable whose value is symbol giving operating system type */
+/* Variable whose value is symbol giving operating system type.  */

 Lisp_Object Vsystem_type;
 Lisp_Object Vsystem_type;

-  
+
+/* Variable whose value is string giving configuration built for.  */
+Lisp_Object Vsystem_configuration;
+
+/* Variable whose value is string giving configuration options,
+   for use when reporting bugs.  */
+Lisp_Object Vsystem_configuration_options;
+

 /* If non-zero, emacs should not attempt to use an window-specific code,
    but instead should use the virtual terminal under which it was started */
 int inhibit_window_system;
 
 /* If non-zero, emacs should not attempt to use an window-specific code,
    but instead should use the virtual terminal under which it was started */
 int inhibit_window_system;
 

+/* If nonzero, set Emacs to run at this priority.  This is also used
+   in child_setup and sys_suspend to make sure subshells run at normal
+   priority; Those functions have their own extern declaration.  */
+int emacs_priority;
+
+#ifdef BSD_PGRPS
+/* See sysdep.c.  */
+extern int inherited_pgroup;
+#endif
+

 #ifdef HAVE_X_WINDOWS
 /* If non-zero, -d was specified, meaning we're using some window system. */
 int display_arg;
 #ifdef HAVE_X_WINDOWS
 /* If non-zero, -d was specified, meaning we're using some window system. */
 int display_arg;


@@ -99,6 +132,10 @@ int noninteractive;
    but nothing terrible happens if user sets this one.  */
 
 int noninteractive1;
    but nothing terrible happens if user sets this one.  */
 
 int noninteractive1;

+
+/* Save argv and argc.  */
+char **initial_argv;
+int initial_argc;

 \f
 /* Signal code for the fatal signal that was received */
 int fatal_error_code;
 \f
 /* Signal code for the fatal signal that was received */
 int fatal_error_code;


@@ -107,51 +144,50 @@ int fatal_error_code;
 int fatal_error_in_progress;
 
 /* Handle bus errors, illegal instruction, etc. */
 int fatal_error_in_progress;
 
 /* Handle bus errors, illegal instruction, etc. */

+SIGTYPE

 fatal_error_signal (sig)
      int sig;
 {
 fatal_error_signal (sig)
      int sig;
 {

-#ifdef BSD
-  int tpgrp;
-#endif /* BSD */
-

   fatal_error_code = sig;
   signal (sig, SIG_DFL);
 
   /* If fatal error occurs in code below, avoid infinite recursion.  */
   fatal_error_code = sig;
   signal (sig, SIG_DFL);
 
   /* If fatal error occurs in code below, avoid infinite recursion.  */

-  if (fatal_error_in_progress)
-    kill (getpid (), fatal_error_code);
-
-  fatal_error_in_progress = 1;
-
-  /* If we are controlling the terminal, reset terminal modes */
-#ifdef BSD
-  if (ioctl(0, TIOCGPGRP, &tpgrp) == 0
-      && tpgrp == getpgrp (0))
-#endif /* BSD */
+  if (! fatal_error_in_progress)

     {
     {

-      reset_sys_modes ();
-      if (sig != SIGTERM)
-       fprintf (stderr, "Fatal error (%d).", sig);
-    }
-
-  /* Clean up */
-#ifdef subprocesses
-  kill_buffer_processes (Qnil);
-#endif
-  Fdo_auto_save (Qt, Qnil);
+      fatal_error_in_progress = 1;

 
 

-#ifdef CLASH_DETECTION
-  unlock_all_files ();
-#endif /* CLASH_DETECTION */
+      shut_down_emacs (sig, 0, Qnil);
+    }

 
 #ifdef VMS
 
 #ifdef VMS

-  kill_vms_processes ();

   LIB$STOP (SS$_ABORT);
 #else
   LIB$STOP (SS$_ABORT);
 #else

-  /* Signal the same code; this time it will really be fatal.  */
+  /* Signal the same code; this time it will really be fatal.
+     Remember that since we're in a signal handler, the signal we're
+     going to send is probably blocked, so we have to unblock it if we
+     want to really receive it.  */
+#ifndef MSDOS
+  sigunblock (sigmask (fatal_error_code));
+#endif

   kill (getpid (), fatal_error_code);
 #endif /* not VMS */
 }
   kill (getpid (), fatal_error_code);
 #endif /* not VMS */
 }

+
+#ifdef SIGDANGER
+
+/* Handler for SIGDANGER.  */
+SIGTYPE
+memory_warning_signal (sig)
+     int sig;
+{
+  signal (sig, memory_warning_signal);
+
+  malloc_warning ("Operating system warns that virtual memory is running low.\n");
+
+  /* It might be unsafe to call do_auto_save now.  */
+  force_auto_save_soon ();
+}
+#endif

 \f
 /* Code for dealing with Lisp access to the Unix command line */
 
 \f
 /* Code for dealing with Lisp access to the Unix command line */
 


@@ -162,6 +198,80 @@ init_cmdargs (argc, argv, skip_args)
      int skip_args;
 {
   register int i;
      int skip_args;
 {
   register int i;

+  Lisp_Object name, dir;
+
+  initial_argv = argv;
+  initial_argc = argc;
+
+  Vinvocation_name = Ffile_name_nondirectory (build_string (argv[0]));
+  Vinvocation_directory = Ffile_name_directory (build_string (argv[0]));
+  /* If we got no directory in argv[0], search PATH to find where
+     Emacs actually came from.  */
+  if (NILP (Vinvocation_directory))
+    {
+      Lisp_Object found;
+      int yes = openp (Vexec_path, Vinvocation_name,
+                      EXEC_SUFFIXES, &found, 1);
+      if (yes == 1)
+       Vinvocation_directory = Ffile_name_directory (found);
+    }
+
+  Vinstallation_directory = Qnil;
+
+  if (!NILP (Vinvocation_directory))
+    {
+      dir = Vinvocation_directory;
+      name = Fexpand_file_name (Vinvocation_name, dir);
+      while (1)
+       {
+         Lisp_Object tem, lib_src_exists;
+         Lisp_Object etc_exists, info_exists;
+
+         /* See if dir contains subdirs for use by Emacs.
+            Check for the ones that would exist in a build directory,
+            not including lisp and info.  */
+         tem = Fexpand_file_name (build_string ("lib-src"), dir);
+         lib_src_exists = Ffile_exists_p (tem);
+         if (!NILP (lib_src_exists))
+           {
+             tem = Fexpand_file_name (build_string ("etc"), dir);
+             etc_exists = Ffile_exists_p (tem);
+             if (!NILP (etc_exists))
+               {
+                 Vinstallation_directory
+                   = Ffile_name_as_directory (dir);
+                 break;
+               }
+           }
+
+         /* See if dir's parent contains those subdirs.  */
+         tem = Fexpand_file_name (build_string ("../lib-src"), dir);
+         lib_src_exists = Ffile_exists_p (tem);
+         if (!NILP (lib_src_exists))
+           {
+             tem = Fexpand_file_name (build_string ("../etc"), dir);
+             etc_exists = Ffile_exists_p (tem);
+             if (!NILP (etc_exists))
+               {
+                 tem = Fexpand_file_name (build_string (".."), dir);
+                 Vinstallation_directory
+                   = Ffile_name_as_directory (tem);
+                 break;
+               }
+           }
+
+         /* If the Emacs executable is actually a link,
+            next try the dir that the link points into.  */
+         tem = Ffile_symlink_p (name);
+         if (!NILP (tem))
+           {
+             name = Fexpand_file_name (tem, dir);
+             dir = Ffile_name_directory (name);
+           }
+         else
+           break;
+       }
+    }

 
   Vcommand_line_args = Qnil;
 
 
   Vcommand_line_args = Qnil;
 


@@ -172,6 +282,23 @@ init_cmdargs (argc, argv, skip_args)
          = Fcons (build_string (argv[i]), Vcommand_line_args);
     }
 }
          = Fcons (build_string (argv[i]), Vcommand_line_args);
     }
 }

+
+DEFUN ("invocation-name", Finvocation_name, Sinvocation_name, 0, 0, 0,
+  "Return the program name that was used to run Emacs.\n\
+Any directory names are omitted.")
+  ()
+{
+  return Fcopy_sequence (Vinvocation_name);
+}
+
+DEFUN ("invocation-directory", Finvocation_directory, Sinvocation_directory,
+  0, 0, 0,
+  "Return the directory name in which the Emacs executable was located")
+  ()
+{
+  return Fcopy_sequence (Vinvocation_directory);
+}
+

 \f
 #ifdef VMS
 #ifdef LINK_CRTL_SHARE
 \f
 #ifdef VMS
 #ifdef LINK_CRTL_SHARE


@@ -181,6 +308,91 @@ extern noshare char **environ;
 #endif /* LINK_CRTL_SHARE */
 #endif /* VMS */
 
 #endif /* LINK_CRTL_SHARE */
 #endif /* VMS */
 

+#ifndef ORDINARY_LINK
+/* We don't include crtbegin.o and crtend.o in the link,
+   so these functions and variables might be missed.
+   Provide dummy definitions to avoid error.
+   (We don't have any real constructors or destructors.)  */
+#ifdef __GNUC__
+#ifndef GCC_CTORS_IN_LIBC
+__do_global_ctors ()
+{}
+__do_global_ctors_aux ()
+{}
+__do_global_dtors ()
+{}
+/* Linux has a bug in its library; avoid an error.  */
+#ifndef LINUX
+char * __CTOR_LIST__[2] = { (char *) (-1), 0 };
+#endif
+char * __DTOR_LIST__[2] = { (char *) (-1), 0 };
+#endif /* GCC_CTORS_IN_LIBC */
+__main ()
+{}
+#endif /* __GNUC__ */
+#endif /* ORDINARY_LINK */
+
+/* Test whether the next argument in ARGV matches SSTR or a prefix of
+   LSTR (at least MINLEN characters).  If so, then if VALPTR is non-null
+   (the argument is supposed to have a value) store in *VALPTR either
+   the next argument or the portion of this one after the equal sign.
+   ARGV is read starting at position *SKIPPTR; this index is advanced
+   by the number of arguments used.
+
+   Too bad we can't just use getopt for all of this, but we don't have
+   enough information to do it right.  */
+static int
+argmatch (argv, sstr, lstr, minlen, valptr, skipptr)
+     char **argv;
+     char *sstr;
+     char *lstr;
+     int minlen;
+     char **valptr;
+     int *skipptr;
+{
+  char *p;
+  int arglen;
+  char *arg = argv[*skipptr+1];
+  if (arg == NULL)
+    return 0;
+  if (strcmp (arg, sstr) == 0)
+    {
+      if (valptr != NULL)
+       {
+         *valptr = argv[*skipptr+2];
+         *skipptr += 2;
+       }
+      else
+       *skipptr += 1;
+      return 1;
+    }
+  arglen = (valptr != NULL && (p = index (arg, '=')) != NULL
+           ? p - arg : strlen (arg));
+  if (arglen < minlen || strncmp (arg, lstr, arglen) != 0)
+    return 0;
+  else if (valptr == NULL)
+    {
+      *skipptr += 1;
+      return 1;
+    }
+  else if (p != NULL)
+    {
+      *valptr = p+1;
+      *skipptr += 1;
+      return 1;
+    }
+  else if (argv[*skipptr+2] != NULL)
+    {
+      *valptr = argv[*skipptr+2];
+      *skipptr += 2;
+      return 1;
+    }
+  else
+    {
+      return 0;
+    }
+}
+

 /* ARGSUSED */
 main (argc, argv, envp)
      int argc;
 /* ARGSUSED */
 main (argc, argv, envp)
      int argc;


@@ -191,12 +403,10 @@ main (argc, argv, envp)
   int skip_args = 0;
   extern int errno;
   extern sys_nerr;
   int skip_args = 0;
   extern int errno;
   extern sys_nerr;

-  extern char *sys_errlist[];
-  extern void malloc_warning ();

 
 /* Map in shared memory, if we are using that.  */
 #ifdef HAVE_SHM
 
 /* Map in shared memory, if we are using that.  */
 #ifdef HAVE_SHM

-  if (argc > 1 && !strcmp (argv[1], "-nl"))
+  if (argmatch (argv, "-nl", "--no-shared-memory", 6, NULL, &skip_args))

     {
       map_in_data (0);
       /* The shared memory was just restored, which clobbered this.  */
     {
       map_in_data (0);
       /* The shared memory was just restored, which clobbered this.  */


@@ -210,6 +420,15 @@ main (argc, argv, envp)
     }
 #endif
 
     }
 #endif
 

+#ifdef NeXT
+  extern int malloc_cookie;
+
+  /* This helps out unexnext.c.  */
+  if (initialized)
+    if (malloc_jumpstart (malloc_cookie) != 0)
+      printf ("malloc jumpstart failed!\n");
+#endif /* NeXT */
+

 #ifdef HAVE_X_WINDOWS
   /* Stupid kludge to catch command-line display spec.  We can't
      handle this argument entirely in window system dependent code
 #ifdef HAVE_X_WINDOWS
   /* Stupid kludge to catch command-line display spec.  We can't
      handle this argument entirely in window system dependent code


@@ -218,19 +437,21 @@ main (argc, argv, envp)
   {
     int i;
 
   {
     int i;
 

+    /* We don't check for a long option --display here, since the X code
+       won't be able to recognize that form anyway.  */

     for (i = 1; (i < argc && ! display_arg); i++)
     for (i = 1; (i < argc && ! display_arg); i++)

-      if (!strcmp (argv[i], "-d"))
+      if (!strcmp (argv[i], "-d") || !strcmp (argv[i], "-display"))

        display_arg = 1;
   }
 #endif
 
 #ifdef VMS
   /* If -map specified, map the data file in */
        display_arg = 1;
   }
 #endif
 
 #ifdef VMS
   /* If -map specified, map the data file in */

-  if (argc > 2 && ! strcmp (argv[1], "-map"))
-    {
-      skip_args = 2;
-      mapin_data (argv[2]);
-    }
+  {
+    char *file;
+    if (argmatch (argv, "-map", "--map-data", 3, &mapin_file, &skip_args))
+      mapin_data (file);
+  }

 
 #ifdef LINK_CRTL_SHARE
 #ifdef SHAREABLE_LIB_BUG
 
 #ifdef LINK_CRTL_SHARE
 #ifdef SHAREABLE_LIB_BUG


@@ -261,9 +482,6 @@ main (argc, argv, envp)
 #endif
 
   clearerr (stdin);
 #endif
 
   clearerr (stdin);

-#ifdef BSD
-  setpgrp (0, getpid ());
-#endif

 
 #ifdef APOLLO
 #ifndef APOLLO_SR10
 
 #ifdef APOLLO
 #ifndef APOLLO_SR10


@@ -276,65 +494,97 @@ main (argc, argv, envp)
 
 #ifndef SYSTEM_MALLOC
   if (! initialized)
 
 #ifndef SYSTEM_MALLOC
   if (! initialized)

-    malloc_init (0, malloc_warning);
+    {
+      /* Arrange to get warning messages as memory fills up.  */
+      memory_warnings (0, malloc_warning);
+
+      /* Arrange to disable interrupt input while malloc and friends are
+        running.  */
+      uninterrupt_malloc ();
+    }

 #endif /* not SYSTEM_MALLOC */
 
 #endif /* not SYSTEM_MALLOC */
 

-#ifdef HIGHPRI
-  setpriority (PRIO_PROCESS, getpid (), HIGHPRI);
+#ifdef MSDOS
+  /* We do all file input/output as binary files.  When we need to translate
+     newlines, we do that manually.  */
+  _fmode = O_BINARY;
+  (stdin)->_flag &= ~_IOTEXT;
+  (stdout)->_flag &= ~_IOTEXT;
+  (stderr)->_flag &= ~_IOTEXT;
+#endif /* MSDOS */
+
+#ifdef SET_EMACS_PRIORITY
+  if (emacs_priority)
+    nice (emacs_priority);

   setuid (getuid ());
   setuid (getuid ());

-#endif /* HIGHPRI */
+#endif /* SET_EMACS_PRIORITY */

 
 

-#ifdef BSD
-  /* interrupt_input has trouble if we aren't in a separate process group.  */
-  setpgrp (getpid (), getpid ());
+#ifdef EXTRA_INITIALIZE
+  EXTRA_INITIALIZE;

 #endif
 
   inhibit_window_system = 0;
 
 #endif
 
   inhibit_window_system = 0;
 

-/* Handle the -t switch, which specifies filename to use as terminal */
-  if (skip_args + 2 < argc && !strcmp (argv[skip_args + 1], "-t"))
-    {
-      int result;
-      skip_args += 2;
-      close (0);
-      close (1);
-      result = open (argv[skip_args], O_RDWR, 2 );
-      if (result < 0)
-       {
-         char *errstring;
-
-         if (errno >= 0 && errno < sys_nerr)
-           errstring = sys_errlist[errno];
-         else
-           errstring = "undocumented error code";
-         fprintf (stderr, "emacs: %s: %s\n", argv[skip_args], errstring);
-         exit (1);
-       }
-      dup (0);
-      if (! isatty (0))
-       {
-         fprintf (stderr, "emacs: %s: not a tty\n", argv[skip_args]);
-         exit (1);
-       }
-      fprintf (stderr, "Using %s\n", argv[skip_args]);
+  /* Handle the -t switch, which specifies filename to use as terminal */
+  {
+    char *term;
+    if (argmatch (argv, "-t", "--terminal", 4, &term, &skip_args))
+      {
+       int result;
+       close (0);
+       close (1);
+       result = open (term, O_RDWR, 2 );
+       if (result < 0)
+         {
+           char *errstring = strerror (errno);
+           fprintf (stderr, "emacs: %s: %s\n", term, errstring);
+           exit (1);
+         }
+       dup (0);
+       if (! isatty (0))
+         {
+           fprintf (stderr, "emacs: %s: not a tty\n", term);
+           exit (1);
+         }
+       fprintf (stderr, "Using %s\n", term);

 #ifdef HAVE_X_WINDOWS
 #ifdef HAVE_X_WINDOWS

-      inhibit_window_system = 1;       /* -t => -nw */
+       inhibit_window_system = 1; /* -t => -nw */

 #endif
 #endif

-    }
+      }
+  }
+  if (argmatch (argv, "-nw", "--no-windows", 6, NULL, &skip_args))
+    inhibit_window_system = 1;
+
+  /* Handle the -batch switch, which means don't do interactive display.  */
+  noninteractive = 0;
+  if (argmatch (argv, "-batch", "--batch", 5, NULL, &skip_args))
+    noninteractive = 1;

 
 

-  if (skip_args + 1 < argc
-      && (!strcmp (argv[skip_args + 1], "-nw")))
+  /* Handle the --help option, which gives a usage message..  */
+  if (argmatch (argv, "-help", "--help", 3, NULL, &skip_args))

     {
     {

-      skip_args += 1;
-      inhibit_window_system = 1;
+      printf ("\
+Usage: %s [-t term] [--terminal term]  [-nw] [--no-windows]  [--batch]\n\
+      [-q] [--no-init-file]  [-u user] [--user user]  [--debug-init]\n\
+\(Arguments above this line must be first; those below may be in any order)\n\
+      [-f func] [--funcall func]  [-l file] [--load file]  [--insert file]\n\
+      file-to-visit  [--kill]\n", argv[0]);
+      exit (0);

     }
 
     }
 

-/* Handle the -batch switch, which means don't do interactive display.  */
-  noninteractive = 0;
-  if (skip_args + 1 < argc && !strcmp (argv[skip_args + 1], "-batch"))
+  if (! noninteractive)

     {
     {

-      skip_args += 1;
-      noninteractive = 1;
+#ifdef BSD_PGRPS
+      if (initialized)
+       {
+         inherited_pgroup = EMACS_GETPGRP (0);
+         setpgrp (0, getpid ());
+       }
+#else
+#if defined (USG5) && defined (INTERRUPT_INPUT)
+      setpgrp ();
+#endif
+#endif

     }
 
 #ifdef POSIX_SIGNALS
     }
 
 #ifdef POSIX_SIGNALS


@@ -356,14 +606,21 @@ main (argc, argv, envp)
       signal (SIGQUIT, fatal_error_signal);
       signal (SIGILL, fatal_error_signal);
       signal (SIGTRAP, fatal_error_signal);
       signal (SIGQUIT, fatal_error_signal);
       signal (SIGILL, fatal_error_signal);
       signal (SIGTRAP, fatal_error_signal);

+#ifdef SIGIOT
+      /* This is missing on some systems - OS/2, for example.  */

       signal (SIGIOT, fatal_error_signal);
       signal (SIGIOT, fatal_error_signal);

+#endif

 #ifdef SIGEMT
       signal (SIGEMT, fatal_error_signal);
 #endif
       signal (SIGFPE, fatal_error_signal);
 #ifdef SIGEMT
       signal (SIGEMT, fatal_error_signal);
 #endif
       signal (SIGFPE, fatal_error_signal);

+#ifdef SIGBUS

       signal (SIGBUS, fatal_error_signal);
       signal (SIGBUS, fatal_error_signal);

+#endif

       signal (SIGSEGV, fatal_error_signal);
       signal (SIGSEGV, fatal_error_signal);

+#ifdef SIGSYS

       signal (SIGSYS, fatal_error_signal);
       signal (SIGSYS, fatal_error_signal);

+#endif

       signal (SIGTERM, fatal_error_signal);
 #ifdef SIGXCPU
       signal (SIGXCPU, fatal_error_signal);
       signal (SIGTERM, fatal_error_signal);
 #ifdef SIGXCPU
       signal (SIGXCPU, fatal_error_signal);


@@ -372,18 +629,17 @@ main (argc, argv, envp)
       signal (SIGXFSZ, fatal_error_signal);
 #endif /* SIGXFSZ */
 
       signal (SIGXFSZ, fatal_error_signal);
 #endif /* SIGXFSZ */
 

-#ifdef AIX
-      signal (SIGDANGER, fatal_error_signal);
-      signal (20, fatal_error_signal);
-      signal (21, fatal_error_signal);
-      signal (22, fatal_error_signal);
-      signal (23, fatal_error_signal);
-      signal (24, fatal_error_signal);
-#ifdef SIGIO
-      signal (SIGAIO, fatal_error_signal);
-      signal (SIGPTY, fatal_error_signal);
+#ifdef SIGDANGER
+      /* This just means available memory is getting low.  */
+      signal (SIGDANGER, memory_warning_signal);

 #endif
 #endif

+
+#ifdef AIX
+/* 20 is SIGCHLD, 21 is SIGTTIN, 22 is SIGTTOU.  */
+      signal (SIGXCPU, fatal_error_signal);
+#ifndef _I386

       signal (SIGIOINT, fatal_error_signal);
       signal (SIGIOINT, fatal_error_signal);

+#endif

       signal (SIGGRANT, fatal_error_signal);
       signal (SIGRETRACT, fatal_error_signal);
       signal (SIGSOUND, fatal_error_signal);
       signal (SIGGRANT, fatal_error_signal);
       signal (SIGRETRACT, fatal_error_signal);
       signal (SIGSOUND, fatal_error_signal);


@@ -410,24 +666,42 @@ main (argc, argv, envp)
     }
 
   init_alloc ();
     }
 
   init_alloc ();

-#ifdef MAINTAIN_ENVIRONMENT
-  init_environ ();
-#endif

   init_eval ();
   init_data ();
   init_eval ();
   init_data ();

-  init_lread ();

 
 

-  init_cmdargs (argc, argv, skip_args);        /* Create list Vcommand_line_args */
+#ifdef MSDOS
+  /* Call early 'cause init_environment needs it.  */
+  init_dosfns ();
+  /* Set defaults for several environment variables.  */
+  if (initialized) init_environment (argc, argv, skip_args);
+#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.  */
+  set_process_environment ();
+  /* AIX crashes are reported in system versions 3.2.3 and 3.2.4
+     if this is not done.  Do it after set_process_environment so that we
+     don't pollute Vprocess_environment.  */
+#ifdef AIX
+  putenv ("LANG=C");
+#endif
+

   init_buffer ();      /* Init default directory of main buffer */
   init_buffer ();      /* Init default directory of main buffer */

+
+  init_callproc_1 ();  /* Must precede init_cmdargs and init_sys_modes.  */
+  init_cmdargs (argc, argv, skip_args);        /* Must precede init_lread.  */
+  init_callproc ();    /* Must follow init_cmdargs but not init_sys_modes.  */
+  init_lread ();
+

   if (!noninteractive)
     {
 #ifdef VMS
   if (!noninteractive)
     {
 #ifdef VMS

-      init_vms_input ();/* init_display calls get_screen_size, that needs this */
+      init_vms_input ();/* init_display calls get_frame_size, that needs this */

 #endif /* VMS */
       init_display (); /* Determine terminal type.  init_sys_modes uses results */
     }
   init_keyboard ();    /* This too must precede init_sys_modes */
 #endif /* VMS */
       init_display (); /* Determine terminal type.  init_sys_modes uses results */
     }
   init_keyboard ();    /* This too must precede init_sys_modes */

-  init_callproc ();    /* And this too. */

 #ifdef VMS
   init_vmsproc ();     /* And this too. */
 #endif /* VMS */
 #ifdef VMS
   init_vmsproc ();     /* And this too. */
 #endif /* VMS */


@@ -441,9 +715,10 @@ main (argc, argv, envp)
 #ifdef VMS
   init_vmsfns ();
 #endif /* VMS */
 #ifdef VMS
   init_vmsfns ();
 #endif /* VMS */

-#ifdef subprocesses

   init_process ();
   init_process ();

-#endif /* subprocesses */
+#ifdef CLASH_DETECTION
+  init_filelock ();
+#endif /* CLASH_DETECTION */

 
 /* Intern the names of all standard functions and variables; define standard keys */
 
 
 /* Intern the names of all standard functions and variables; define standard keys */
 


@@ -454,16 +729,11 @@ main (argc, argv, envp)
         for the sake of symbols like error-message */
       syms_of_data ();
       syms_of_alloc ();
         for the sake of symbols like error-message */
       syms_of_data ();
       syms_of_alloc ();

-#ifdef MAINTAIN_ENVIRONMENT
-      syms_of_environ ();
-#endif /* MAINTAIN_ENVIRONMENT */

       syms_of_lread ();
       syms_of_print ();
       syms_of_eval ();
       syms_of_fns ();
       syms_of_lread ();
       syms_of_print ();
       syms_of_eval ();
       syms_of_fns ();

-#ifdef LISP_FLOAT_TYPE

       syms_of_floatfns ();
       syms_of_floatfns ();

-#endif

 
       syms_of_abbrev ();
       syms_of_buffer ();
 
       syms_of_abbrev ();
       syms_of_buffer ();


@@ -491,15 +761,15 @@ main (argc, argv, envp)
       syms_of_marker ();
       syms_of_minibuf ();
       syms_of_mocklisp ();
       syms_of_marker ();
       syms_of_minibuf ();
       syms_of_mocklisp ();

-#ifdef subprocesses

       syms_of_process ();
       syms_of_process ();

-#endif /* subprocesses */

       syms_of_search ();
       syms_of_search ();

-#ifdef MULTI_SCREEN
-      syms_of_screen ();
-#endif
+      syms_of_frame ();

       syms_of_syntax ();
       syms_of_syntax ();

+      syms_of_term ();

       syms_of_undo ();
       syms_of_undo ();

+
+      /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
+      syms_of_textprop ();

 #ifdef VMS
       syms_of_vmsproc ();
 #endif /* VMS */
 #ifdef VMS
       syms_of_vmsproc ();
 #endif /* VMS */


@@ -508,6 +778,7 @@ main (argc, argv, envp)
 #ifdef HAVE_X_WINDOWS
       syms_of_xterm ();
       syms_of_xfns ();
 #ifdef HAVE_X_WINDOWS
       syms_of_xterm ();
       syms_of_xfns ();

+      syms_of_xfaces ();

 #ifdef HAVE_X11
       syms_of_xselect ();
 #endif
 #ifdef HAVE_X11
       syms_of_xselect ();
 #endif


@@ -516,6 +787,11 @@ main (argc, argv, envp)
 #endif /* HAVE_X_MENU */
 #endif /* HAVE_X_WINDOWS */
 
 #endif /* HAVE_X_MENU */
 #endif /* HAVE_X_WINDOWS */
 

+#if defined (MSDOS) && !defined (HAVE_X_WINDOWS)
+      syms_of_xfaces ();
+      syms_of_xmenu ();
+#endif
+

 #ifdef SYMS_SYSTEM
       SYMS_SYSTEM;
 #endif
 #ifdef SYMS_SYSTEM
       SYMS_SYSTEM;
 #endif


@@ -532,17 +808,19 @@ main (argc, argv, envp)
       keys_of_macros ();
       keys_of_minibuf ();
       keys_of_window ();
       keys_of_macros ();
       keys_of_minibuf ();
       keys_of_window ();

+      keys_of_frame ();

     }
 
   if (!initialized)
     {
     }
 
   if (!initialized)
     {

+      char *file;

       /* Handle -l loadup-and-dump, args passed by Makefile. */
       /* Handle -l loadup-and-dump, args passed by Makefile. */

-      if (argc > 2 + skip_args && !strcmp (argv[1 + skip_args], "-l"))
+      if (argmatch (argv, "-l", "--load", 3, &file, &skip_args))

        Vtop_level = Fcons (intern ("load"),
        Vtop_level = Fcons (intern ("load"),

-                           Fcons (build_string (argv[2 + skip_args]), Qnil));
+                           Fcons (build_string (file), Qnil));

 #ifdef CANNOT_DUMP
       /* Unless next switch is -nl, load "loadup.el" first thing.  */
 #ifdef CANNOT_DUMP
       /* Unless next switch is -nl, load "loadup.el" first thing.  */

-      if (!(argc > 1 + skip_args && !strcmp (argv[1 + skip_args], "-nl")))
+      if (!argmatch (argv, "-nl", "--no-loadup", 6, NULL, &skip_args))

        Vtop_level = Fcons (intern ("load"),
                            Fcons (build_string ("loadup.el"), Qnil));
 #endif /* CANNOT_DUMP */
        Vtop_level = Fcons (intern ("load"),
                            Fcons (build_string ("loadup.el"), Qnil));
 #endif /* CANNOT_DUMP */


@@ -550,13 +828,32 @@ main (argc, argv, envp)
 
   initialized = 1;
 
 
   initialized = 1;
 

+#if defined (sun) || defined (LOCALTIME_CACHE)
+  /* sun's localtime has a bug.  it caches the value of the time
+     zone rather than looking it up every time.  Since localtime() is
+     called to bolt the undumping time into the undumped emacs, this
+     results in localtime ignoring the TZ environment variable.
+     This flushes the new TZ value into localtime. */
+  tzset ();
+#endif /* defined (sun) || defined (LOCALTIME_CACHE) */
+
+  /* Handle the GNU standard option --version.  */
+  if (argmatch (argv, "-version", "--version", 3, NULL, &skip_args))
+    {
+      Lisp_Object ver;
+      ver = call0 (intern ("emacs-version"));
+      if (STRINGP (ver))
+       printf ("%s\n", XSTRING (ver)->data);
+      exit (0);
+    }
+

   /* Enter editor command loop.  This never returns.  */
   Frecursive_edit ();
   /* NOTREACHED */
 }
 \f
 DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P",
   /* Enter editor command loop.  This never returns.  */
   Frecursive_edit ();
   /* NOTREACHED */
 }
 \f
 DEFUN ("kill-emacs", Fkill_emacs, Skill_emacs, 0, 1, "P",

-  "Exit the Emacs job and kill it.  Ask for confirmation, without argument.\n\
+  "Exit the Emacs job and kill it.\n\

 If ARG is an integer, return ARG as the exit program code.\n\
 If ARG is a  string, stuff it as keyboard input.\n\n\
 The value of `kill-emacs-hook', if not void,\n\
 If ARG is an integer, return ARG as the exit program code.\n\
 If ARG is a  string, stuff it as keyboard input.\n\n\
 The value of `kill-emacs-hook', if not void,\n\


@@ -574,54 +871,102 @@ all of which are called before Emacs is actually killed.")
   if (feof (stdin))
     arg = Qt;
 
   if (feof (stdin))
     arg = Qt;
 

-  if (!NULL (Vrun_hooks) && !noninteractive)
+  if (!NILP (Vrun_hooks) && !noninteractive)

     call1 (Vrun_hooks, intern ("kill-emacs-hook"));
 
     call1 (Vrun_hooks, intern ("kill-emacs-hook"));
 

-#ifdef subprocesses
-  kill_buffer_processes (Qnil);
-#endif /* subprocesses */
+  UNGCPRO;

 
 

+/* Is it really necessary to do this deassign
+   when we are going to exit anyway?  */
+/* #ifdef VMS
+  stop_vms_input ();
+ #endif  */
+
+  shut_down_emacs (0, 0, STRINGP (arg) ? arg : Qnil);
+
+  exit (INTEGERP (arg) ? XINT (arg)

 #ifdef VMS
 #ifdef VMS

-  kill_vms_processes ();
-#endif /* VMS */
+       : 1
+#else
+       : 0
+#endif
+       );
+  /* NOTREACHED */
+}
+
+
+/* Perform an orderly shutdown of Emacs.  Autosave any modified
+   buffers, kill any child processes, clean up the terminal modes (if
+   we're in the foreground), and other stuff like that.  Don't perform
+   any redisplay; this may be called when Emacs is shutting down in
+   the background, or after its X connection has died.
+
+   If SIG is a signal number, print a message for it.
+
+   This is called by fatal signal handlers, X protocol error handlers,
+   and Fkill_emacs.  */
+
+void
+shut_down_emacs (sig, no_x, stuff)
+     int sig, no_x;
+     Lisp_Object stuff;
+{
+  /* Prevent running of hooks from now on.  */
+  Vrun_hooks = Qnil;
+
+  /* If we are controlling the terminal, reset terminal modes */
+#ifdef EMACS_HAVE_TTY_PGRP
+  {
+    int pgrp = EMACS_GETPGRP (0);
+
+    int tpgrp;
+    if (EMACS_GET_TTY_PGRP (0, &tpgrp) != -1
+       && tpgrp == pgrp)
+      {
+       fflush (stdout);
+       reset_sys_modes ();
+       if (sig && sig != SIGTERM)
+         fprintf (stderr, "Fatal error (%d).", sig);
+      }
+  }
+#else
+  fflush (stdout);
+  reset_sys_modes ();
+#endif
+
+  stuff_buffered_input (stuff);

 
 

+  kill_buffer_processes (Qnil);

   Fdo_auto_save (Qt, Qnil);
 
 #ifdef CLASH_DETECTION
   unlock_all_files ();
   Fdo_auto_save (Qt, Qnil);
 
 #ifdef CLASH_DETECTION
   unlock_all_files ();

-#endif /* CLASH_DETECTION */
+#endif

 
 

-  fflush (stdout);
-  reset_sys_modes ();
+#ifdef VMS
+  kill_vms_processes ();
+#endif

 
 

+#if 0 /* This triggers a bug in XCloseDisplay and is not needed.  */

 #ifdef HAVE_X_WINDOWS
 #ifdef HAVE_X_WINDOWS

-  if (!noninteractive && EQ (Vwindow_system, intern ("x")))
+  /* It's not safe to call intern here.  Maybe we are crashing.  */
+  if (!noninteractive && SYMBOLP (Vwindow_system)
+      && XSYMBOL (Vwindow_system)->name->size == 1
+      && XSYMBOL (Vwindow_system)->name->data[0] == 'x'
+      && ! no_x)

     Fx_close_current_connection ();
 #endif /* HAVE_X_WINDOWS */
     Fx_close_current_connection ();
 #endif /* HAVE_X_WINDOWS */

+#endif

 
 

-  UNGCPRO;
-
-/* Is it really necessary to do this deassign
-   when we are going to exit anyway?  */
-/* #ifdef VMS
-  stop_vms_input ();
- #endif  */
-  stuff_buffered_input (arg);

 #ifdef SIGIO
   /* There is a tendency for a SIGIO signal to arrive within exit,
      and cause a SIGHUP because the input descriptor is already closed.  */
   unrequest_sigio ();
   signal (SIGIO, SIG_IGN);
 #endif
 #ifdef SIGIO
   /* There is a tendency for a SIGIO signal to arrive within exit,
      and cause a SIGHUP because the input descriptor is already closed.  */
   unrequest_sigio ();
   signal (SIGIO, SIG_IGN);
 #endif

-  exit ((XTYPE (arg) == Lisp_Int) ? XINT (arg)
-#ifdef VMS
-       : 1
-#else
-       : 0
-#endif
-       );
-  /* NOTREACHED */

 }
 }

+
+

 \f
 #ifndef CANNOT_DUMP
 /* Nothing like this can be implemented on an Apollo.
 \f
 #ifndef CANNOT_DUMP
 /* Nothing like this can be implemented on an Apollo.


@@ -637,7 +982,6 @@ This function exists on systems that use HAVE_SHM.")
 {
   extern int my_edata;
   Lisp_Object tem;
 {
   extern int my_edata;
   Lisp_Object tem;

-  extern void malloc_warning ();

 
   CHECK_STRING (intoname, 0);
   intoname = Fexpand_file_name (intoname, Qnil);
 
   CHECK_STRING (intoname, 0);
   intoname = Fexpand_file_name (intoname, Qnil);


@@ -649,7 +993,7 @@ This function exists on systems that use HAVE_SHM.")
   /* Tell malloc where start of impure now is */
   /* Also arrange for warnings when nearly out of space.  */
 #ifndef SYSTEM_MALLOC
   /* Tell malloc where start of impure now is */
   /* Also arrange for warnings when nearly out of space.  */
 #ifndef SYSTEM_MALLOC

-  malloc_init (&my_edata, malloc_warning);
+  memory_warnings (&my_edata, malloc_warning);

 #endif
   map_out_data (XSTRING (intoname)->data);
 
 #endif
   map_out_data (XSTRING (intoname)->data);
 


@@ -673,11 +1017,10 @@ and announce itself normally when it is run.")
 {
   extern int my_edata;
   Lisp_Object tem;
 {
   extern int my_edata;
   Lisp_Object tem;

-  extern void malloc_warning ();

 
   CHECK_STRING (intoname, 0);
   intoname = Fexpand_file_name (intoname, Qnil);
 
   CHECK_STRING (intoname, 0);
   intoname = Fexpand_file_name (intoname, Qnil);

-  if (!NULL (symname))
+  if (!NILP (symname))

     {
       CHECK_STRING (symname, 0);
       if (XSTRING (symname)->size)
     {
       CHECK_STRING (symname, 0);
       if (XSTRING (symname)->size)


@@ -694,10 +1037,10 @@ and announce itself normally when it is run.")
   /* Tell malloc where start of impure now is */
   /* Also arrange for warnings when nearly out of space.  */
 #ifndef SYSTEM_MALLOC
   /* Tell malloc where start of impure now is */
   /* Also arrange for warnings when nearly out of space.  */
 #ifndef SYSTEM_MALLOC

-  malloc_init (&my_edata, malloc_warning);
+  memory_warnings (&my_edata, malloc_warning);

 #endif
   unexec (XSTRING (intoname)->data,
 #endif
   unexec (XSTRING (intoname)->data,

-         !NULL (symname) ? XSTRING (symname)->data : 0, &my_edata, 0, 0);
+         !NILP (symname) ? XSTRING (symname)->data : 0, &my_edata, 0, 0);

 #endif /* not VMS */
 
   Vpurify_flag = tem;
 #endif /* not VMS */
 
   Vpurify_flag = tem;


@@ -709,9 +1052,7 @@ and announce itself normally when it is run.")
 
 #endif /* not CANNOT_DUMP */
 \f
 
 #endif /* not CANNOT_DUMP */
 \f

-#ifdef VMS
-#define SEPCHAR ','
-#else
+#ifndef SEPCHAR

 #define SEPCHAR ':'
 #endif
 
 #define SEPCHAR ':'
 #endif
 


@@ -720,11 +1061,16 @@ decode_env_path (evarname, defalt)
      char *evarname, *defalt;
 {
   register char *path, *p;
      char *evarname, *defalt;
 {
   register char *path, *p;

-  extern char *index ();

 
   Lisp_Object lpath;
 
 
   Lisp_Object lpath;
 

-  path = (char *) egetenv (evarname);
+  /* It's okay to use getenv here, because this function is only used
+     to initialize variables when Emacs starts up, and isn't called
+     after that.  */
+  if (evarname != 0)
+    path = (char *) getenv (evarname);
+  else
+    path = 0;

   if (!path)
     path = defalt;
   lpath = Qnil;
   if (!path)
     path = defalt;
   lpath = Qnil;


@@ -744,14 +1090,19 @@ decode_env_path (evarname, defalt)
 
 syms_of_emacs ()
 {
 
 syms_of_emacs ()
 {

+#ifndef CANNOT_DUMP

 #ifdef HAVE_SHM
   defsubr (&Sdump_emacs_data);
 #else
   defsubr (&Sdump_emacs);
 #ifdef HAVE_SHM
   defsubr (&Sdump_emacs_data);
 #else
   defsubr (&Sdump_emacs);

+#endif

 #endif
 
   defsubr (&Skill_emacs);
 
 #endif
 
   defsubr (&Skill_emacs);
 

+  defsubr (&Sinvocation_name);
+  defsubr (&Sinvocation_directory);
+

   DEFVAR_LISP ("command-line-args", &Vcommand_line_args,
     "Args passed by shell to Emacs, as a list of strings.");
 
   DEFVAR_LISP ("command-line-args", &Vcommand_line_args,
     "Args passed by shell to Emacs, as a list of strings.");
 


@@ -759,6 +1110,45 @@ syms_of_emacs ()
     "Value is symbol indicating type of operating system you are using.");
   Vsystem_type = intern (SYSTEM_TYPE);
 
     "Value is symbol indicating type of operating system you are using.");
   Vsystem_type = intern (SYSTEM_TYPE);
 

+  DEFVAR_LISP ("system-configuration", &Vsystem_configuration,
+    "Value is string indicating configuration Emacs was built for.");
+  Vsystem_configuration = build_string (EMACS_CONFIGURATION);
+
+  DEFVAR_LISP ("system-configuration-options", &Vsystem_configuration_options,
+    "String containing the configuration options Emacs was built with.");
+  Vsystem_configuration_options = build_string (EMACS_CONFIG_OPTIONS);
+

   DEFVAR_BOOL ("noninteractive", &noninteractive1,
     "Non-nil means Emacs is running without interactive terminal.");
   DEFVAR_BOOL ("noninteractive", &noninteractive1,
     "Non-nil means Emacs is running without interactive terminal.");

+
+  DEFVAR_LISP ("kill-emacs-hook", &Vkill_emacs_hook,
+    "Hook to be run whenever kill-emacs is called.\n\
+Since kill-emacs may be invoked when the terminal is disconnected (or\n\
+in other similar situations), functions placed on this hook should not\n\
+expect to be able to interact with the user.");
+  Vkill_emacs_hook = Qnil;
+
+  DEFVAR_INT ("emacs-priority", &emacs_priority,
+    "Priority for Emacs to run at.\n\
+This value is effective only if set before Emacs is dumped,\n\
+and only if the Emacs executable is installed with setuid to permit\n\
+it to change priority.  (Emacs sets its uid back to the real uid.)\n\
+Currently, you need to define SET_EMACS_PRIORITY in `config.h'\n\
+before you compile Emacs, to enable the code for this feature.");
+  emacs_priority = 0;
+
+  DEFVAR_LISP ("invocation-name", &Vinvocation_name,
+    "The program name that was used to run Emacs.\n\
+Any directory names are omitted.");
+
+  DEFVAR_LISP ("invocation-directory", &Vinvocation_directory,
+    "The directory in which the Emacs executable was found, to run it.\n\
+The value is nil if that directory's name is not known.");
+
+  DEFVAR_LISP ("installation-directory", &Vinstallation_directory,
+    "A directory within which to look for the `lib-src' and `etc' directories.\n\
+This is non-nil when we can't find those directories in their standard\n\
+installed locations, but we can find them\n\
+near where the Emacs executable was found.");
+  Vinstallation_directory = Qnil;

 }
 }