*** empty log message ***

5 files changed, 84 insertions, 56 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 2458dc57dff..8cb7bdbdefa 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -11,7 +11,7 @@ SHELL = /bin/sh
 all: xmakefile doall
 
 doall:
-        $(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} all
+        $(MAKE) CC=${CC} $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} all
 
 #This is used in making a distribution.
 #Do not use it on development directories!
diff --git a/src/callint.c b/src/callint.c
index f78a82af022..ffee0785095 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -1,5 +1,5 @@
 /* Call a Lisp function interactively.
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -177,12 +177,14 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
   /* Save this now, since use ofminibuffer will clobber it. */
   prefix_arg = Vcurrent_prefix_arg;
 
-retry:
+ retry:
 
   for (fun = function;
        XTYPE (fun) == Lisp_Symbol && !EQ (fun, Qunbound);
        fun = XSYMBOL (fun)->function)
-    ;
+    {
+      QUIT;
+    }
 
   specs = Qnil;
   string = 0;
@@ -231,8 +233,14 @@ retry:
   else
     goto lose;
 
+  /* If either specs or string is set to a string, use it.  */
   if (XTYPE (specs) == Lisp_String)
-    string = XSTRING (specs)->data;
+    {
+      /* Make a copy of string so that if a GC relocates specs,
+         `string' will still be valid.  */
+      string = (char *) alloca (XSTRING (specs)->size + 1);
+      bcopy (XSTRING (specs)->data, string, XSTRING (specs)->size + 1);
+    }
   else if (string == 0)
     {
       i = num_input_chars;
@@ -297,7 +305,7 @@ retry:
   gcpro4.nvars = (count + 1);
 
   tem = string;
-   for (i = 1; *tem; i++)
+  for (i = 1; *tem; i++)
     {
       strncpy (prompt1, tem + 1, sizeof prompt1 - 1);
       prompt1[sizeof prompt1 - 1] = 0;
@@ -309,7 +317,7 @@ retry:
         argstrings[j]
           = EQ (visargs[j], Qnil)
             ? (unsigned char *) ""
-            : XSTRING (visargs[j])->data;
+              : XSTRING (visargs[j])->data;
 
       doprnt (prompt, sizeof prompt, prompt1, 0, j - 1, argstrings + 1);
 
diff --git a/src/config.in b/src/config.in
index be3cc0dbda5..6fd403fa75d 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1,4 +1,4 @@
-/* GNU Emacs site configuration template file.
+/* GNU Emacs site configuration template file.  -*- C -*-
    Copyright (C) 1988 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -93,18 +93,20 @@ and this notice must be preserved on all copies.  */
 #define GLYPH unsigned char
 #endif
 
-/* The configuration script links system.h to a s- file that describes
-   the system type you are using.
-   See the file ../etc/MACHINES for a list of systems and
-   the names of the s- files to use for them.
-   See s-template.h for documentation on writing s- files.  */
+/* The configuration script replaces the string @opsystem@ with the
+   name of the s/*.h file that describes the system type you are
+   using; an option of the form "-opsystem=OPSYS" says to use
+   "s/OPSYS.h".  See the file ../etc/MACHINES for a list of systems
+   and the -opsystem flags to use for them.
+   See s/template.h for documentation on writing s/*.h files.  */
 #include "@opsystem@"
 
-/* The configuration script links machine.h to a m- file that
-   describes the machine and system you use.
-   See the file ../etc/MACHINES for a list of machines and
-   the names of the m- files to use for them.
-   See m-template.h for info on what m- files should define.  */
+/* The configuration script replaces the string @machine@ with the
+   name of the m/*.h file that describes the machine you are
+   using; an option of the form "-machine=MACH" says to use
+   "m/MACH.h".  See the file ../etc/MACHINES for a list of machines
+   and the -machine flags to use for them.
+   See m/template.h for documentation on writing m/*.h files.  */
 #include "@machine@"
 
 /* Load in the conversion definitions if this system
@@ -122,7 +124,7 @@ and this notice must be preserved on all copies.  */
    have code for asynchronous subprocesses
    (as used in M-x compile and M-x shell).
    These do not work for some USG systems yet;
-   for the ones where they work, the s-*.h file defines this flag.  */
+   for the ones where they work, the s/*.h file defines this flag.  */
 
 #ifndef VMS
 #ifndef USG
diff --git a/src/indent.c b/src/indent.c
index 50536120d8b..3f3745a5565 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -477,10 +477,10 @@ compute_motion (from, fromvpos, fromhpos, to, tovpos, tohpos, width, hscroll, ta
               /* A visible line.  */
               vpos++;
               hpos = 0;
-              hpos -= hscroll;
-              if (hscroll > 0) hpos++; /* Count the ! on column 0 */
-              tab_offset = 0;
-            }
+          hpos -= hscroll;
+          if (hscroll > 0) hpos++; /* Count the ! on column 0 */
+          tab_offset = 0;
+        }
         }
       else if (c == CR && selective < 0)
         {
diff --git a/src/lread.c b/src/lread.c
index 5a5c106c6e6..78d578758b0 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -5,7 +5,7 @@ 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,
@@ -1431,49 +1431,67 @@ defvar_per_buffer (namestring, address, doc)
 
 init_lread ()
 {
-  char *normal = PATH_LOADSEARCH;
-  Lisp_Object normal_path;
+  char *normal;
 
   /* Compute the default load-path.  */
-#ifndef CANNOT_DUMP
-  /* If running a dumped Emacs in which load-path was set before dumping
-     to a nonstandard value, use that value.  */
-  if (initialized
-      && !(XTYPE (Vload_path) == Lisp_Cons
-           && XTYPE (XCONS (Vload_path)->car) == Lisp_String
-           && !strcmp (XSTRING (XCONS (Vload_path)->car)->data, "../lisp")))
-    normal_path = Vload_path;
+#ifdef CANNOT_DUMP
+  normal = PATH_LOADSEARCH;
+  Vload_path = decode_env_path ("", normal);
+#else
+  if (NILP (Vpurify_flag))
+    normal = PATH_LOADSEARCH;
   else
-#endif
-    {
-      normal_path = decode_env_path ("", normal);
+    normal = PATH_DUMPLOADSEARCH;
 
-      Vload_path = normal_path;
-    }
+  /* In a dumped Emacs, we normally have to reset the value of
+     Vload_path from PATH_LOADSEARCH, since the value that was dumped
+     uses ../lisp, instead of the path of the installed elisp
+     libraries.  However, if it appears that Vload_path was changed
+     from the default before dumping, don't override that value.  */
+  {
+    Lisp_Object normal_path;
+
+    normal_path = decode_env_path ("", normal);
+
+    if (
+  if (initialized
+      || EQ (Vload_path, initial_path))
+    Vload_path = decode_env_path ("", normal);
+#endif
 
   /* Warn if dirs in the *standard* path don't exist.  */
-  for (; !NILP (normal_path); normal_path = XCONS (normal_path)->cdr)
-    {
-      Lisp_Object dirfile;
-      dirfile = Fcar (normal_path);
-      if (!NILP (dirfile))
-        {
-          dirfile = Fdirectory_file_name (dirfile);
-          if (access (XSTRING (dirfile)->data, 0) < 0)
-            printf ("Warning: lisp library (%s) does not exist.\n",
-                    XSTRING (Fcar (normal_path))->data);
-        }
-    }
+  {
+    Lisp_Object path_tail;
 
-  if (egetenv ("EMACSLOADPATH"))
+    for (path_tail = Vload_path;
+         !NILP (path_tail);
+         path_tail = XCONS (path_tail)->cdr)
+      {
+        Lisp_Object dirfile;
+        dirfile = Fcar (path_tail);
+        if (XTYPE (dirfile) == Lisp_String)
+          {
+            dirfile = Fdirectory_file_name (dirfile);
+            if (access (XSTRING (dirfile)->data, 0) < 0)
+              printf ("Warning: lisp library (%s) does not exist.\n",
+                      XSTRING (Fcar (path_tail))->data);
+          }
+      }
+  }
+
+  /* If the EMACSLOADPATH environment variable is set, use its value.
+     This doesn't apply if we're dumping.  */
+  if (NILP (Vpurify_flag)
+      && egetenv ("EMACSLOADPATH"))
     Vload_path = decode_env_path ("EMACSLOADPATH", normal);
-#ifndef CANNOT_DUMP
-  if (!NILP (Vpurify_flag))
-    Vload_path = Fcons (build_string ("../lisp"), Vload_path);
-#endif
 
   Vvalues = Qnil;
 
+  if (initialized)
+    initial_path = Qnil;
+  else
+    initial_path = Vload_path;
+
   load_in_progress = 0;
 }