1 files changed, 131 insertions, 78 deletions

diff --git a/src/lread.c b/src/lread.c
index 7c0b0475786..23cda8eed6d 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1,6 +1,6 @@
 /* Lisp parsing and input streams.
 
-Copyright (C) 1985-1989, 1993-1995, 1997-2011  Free Software Foundation, Inc.
+Copyright (C) 1985-1989, 1993-1995, 1997-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -3113,7 +3113,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list)
           if (uninterned_symbol && ! NILP (Vpurify_flag))
             name = make_pure_string (read_buffer, nchars, nbytes, multibyte);
           else
-            name = make_specified_string (read_buffer, nchars, nbytes,multibyte);
+            name = make_specified_string (read_buffer, nchars, nbytes, multibyte);
           result = (uninterned_symbol ? Fmake_symbol (name)
                     : Fintern (name, Qnil));
 
@@ -4109,7 +4109,46 @@ init_lread (void)
   const char *normal;
   int turn_off_warning = 0;
 
-  /* Compute the default load-path.  */
+  /* Compute the default Vload-path, with the following logic:
+     If CANNOT_DUMP just use PATH_LOADSEARCH.
+     Else if purify-flag (ie dumping) start from PATH_DUMPLOADSEARCH;
+     otherwise start from PATH_LOADSEARCH.
+     If !initialized, then just set both Vload_path and dump_path.
+     If initialized, then if Vload_path != dump_path, do nothing.
+     (Presumably the load-path has already been changed by something.)
+     Also do nothing if Vinstallation_directory is nil.
+     Otherwise:
+       Remove site-lisp directories from the front of load-path.
+       Add installation-dir/lisp (if exists and not already a member),
+         at the front, and turn off warnings about missing directories
+         (because we are presumably running uninstalled).
+         If it does not exist, add dump_path at the end instead.
+       Add installation-dir/leim (if exists and not already a member)
+         at the front.
+       Add installation-dir/site-lisp (if !no_site_lisp, and exists
+         and not already a member) at the front.
+       If installation-dir != source-dir (ie running an uninstalled,
+         out-of-tree build) AND install-dir/src/Makefile exists BUT
+         install-dir/src/Makefile.in does NOT exist (this is a sanity
+         check), then repeat the above steps for source-dir/lisp,
+         leim and site-lisp.
+       Finally, add the previously removed site-lisp directories back
+       at the front (if !no_site_lisp).
+
+     We then warn about any of the load-path elements that do not
+     exist.  The only ones that might not exist are those from
+     PATH_LOADSEARCH, and perhaps dump_path.
+
+     Having done all this, we then throw it all away if purify-flag is
+     nil (ie, not dumping) and EMACSLOADPATH is set, and just
+     unconditionally use the latter value instead.
+     So AFAICS the only net results of all the previous steps will be
+     possibly to issue some irrelevant warnings.
+
+     FIXME? There's a case for saying that if we are running
+     uninstalled, the eventual installation directories should not yet
+     be included in load-path.
+  */
 #ifdef CANNOT_DUMP
   normal = PATH_LOADSEARCH;
   Vload_path = decode_env_path (0, normal);
@@ -4119,23 +4158,28 @@ init_lread (void)
   else
     normal = PATH_DUMPLOADSEARCH;
 
-  /* 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.  */
+  /* In a dumped Emacs, we normally reset the value of Vload_path using
+     PATH_LOADSEARCH, since the value that was dumped uses lisp/ in
+     the source directory, instead of the path of the installed elisp
+     libraries.  However, if it appears that Vload_path has already been
+     changed from the default that was saved before dumping, don't
+     change it further.  */
   if (initialized)
     {
       if (! NILP (Fequal (dump_path, Vload_path)))
         {
           Vload_path = decode_env_path (0, normal);
-          if (!NILP (Vinstallation_directory))
+          if (no_site_lisp || !NILP (Vinstallation_directory))
             {
               Lisp_Object tem, tem1, sitelisp;
 
-              /* Remove site-lisp dirs from path temporarily and store
-                 them in sitelisp, then conc them on at the end so
-                 they're always first in path.  */
+              /* Remove "site-lisp" dirs from front of path temporarily
+                 and store them in sitelisp, then conc them on at the
+                 end so they're always first in path.
+                 Note that this won't work if you used a
+                 --enable-locallisppath element that does not happen
+                 to contain "site-lisp" in its name.
+              */
               sitelisp = Qnil;
               while (1)
                 {
@@ -4151,96 +4195,99 @@ init_lread (void)
                     break;
                 }
 
-              /* Add to the path the lisp subdir of the
-                 installation dir, if it exists.  */
-              tem = Fexpand_file_name (build_string ("lisp"),
-                                       Vinstallation_directory);
-              tem1 = Ffile_exists_p (tem);
-              if (!NILP (tem1))
-                {
-                  if (NILP (Fmember (tem, Vload_path)))
-                    {
-                      turn_off_warning = 1;
-                      Vload_path = Fcons (tem, Vload_path);
-                    }
-                }
-              else
-                /* That dir doesn't exist, so add the build-time
-                   Lisp dirs instead.  */
-                Vload_path = nconc2 (Vload_path, dump_path);
-
-              /* Add leim under the installation dir, if it exists.  */
-              tem = Fexpand_file_name (build_string ("leim"),
-                                       Vinstallation_directory);
-              tem1 = Ffile_exists_p (tem);
-              if (!NILP (tem1))
-                {
-                  if (NILP (Fmember (tem, Vload_path)))
-                    Vload_path = Fcons (tem, Vload_path);
-                }
-
-              /* Add site-lisp under the installation dir, if it exists.  */
-              if (!no_site_lisp)
+              if (!NILP (Vinstallation_directory))
                 {
-                  tem = Fexpand_file_name (build_string ("site-lisp"),
+                  /* Add to the path the lisp subdir of the
+                     installation dir, if it exists.  */
+                  tem = Fexpand_file_name (build_string ("lisp"),
                                            Vinstallation_directory);
                   tem1 = Ffile_exists_p (tem);
                   if (!NILP (tem1))
                     {
                       if (NILP (Fmember (tem, Vload_path)))
-                        Vload_path = Fcons (tem, Vload_path);
+                        {
+                          turn_off_warning = 1;
+                          Vload_path = Fcons (tem, Vload_path);
+                        }
                     }
-                }
-
-              /* If Emacs was not built in the source directory,
-                 and it is run from where it was built, add to load-path
-                 the lisp, leim and site-lisp dirs under that directory.  */
-
-              if (NILP (Fequal (Vinstallation_directory, Vsource_directory)))
-                {
-                  Lisp_Object tem2;
+                  else
+                    /* That dir doesn't exist, so add the build-time
+                       Lisp dirs instead.  */
+                    Vload_path = nconc2 (Vload_path, dump_path);
 
-                  tem = Fexpand_file_name (build_string ("src/Makefile"),
+                  /* Add leim under the installation dir, if it exists.  */
+                  tem = Fexpand_file_name (build_string ("leim"),
                                            Vinstallation_directory);
                   tem1 = Ffile_exists_p (tem);
-
-                  /* Don't be fooled if they moved the entire source tree
-                     AFTER dumping Emacs.  If the build directory is indeed
-                     different from the source dir, src/Makefile.in and
-                     src/Makefile will not be found together.  */
-                  tem = Fexpand_file_name (build_string ("src/Makefile.in"),
-                                           Vinstallation_directory);
-                  tem2 = Ffile_exists_p (tem);
-                  if (!NILP (tem1) && NILP (tem2))
+                  if (!NILP (tem1))
                     {
-                      tem = Fexpand_file_name (build_string ("lisp"),
-                                               Vsource_directory);
-
                       if (NILP (Fmember (tem, Vload_path)))
                         Vload_path = Fcons (tem, Vload_path);
+                    }
 
-                      tem = Fexpand_file_name (build_string ("leim"),
-                                               Vsource_directory);
+                  /* Add site-lisp under the installation dir, if it exists.  */
+                  if (!no_site_lisp)
+                    {
+                      tem = Fexpand_file_name (build_string ("site-lisp"),
+                                               Vinstallation_directory);
+                      tem1 = Ffile_exists_p (tem);
+                      if (!NILP (tem1))
+                        {
+                          if (NILP (Fmember (tem, Vload_path)))
+                            Vload_path = Fcons (tem, Vload_path);
+                        }
+                    }
 
-                      if (NILP (Fmember (tem, Vload_path)))
-                        Vload_path = Fcons (tem, Vload_path);
+                  /* If Emacs was not built in the source directory,
+                     and it is run from where it was built, add to load-path
+                     the lisp, leim and site-lisp dirs under that directory.  */
 
-                      if (!no_site_lisp)
+                  if (NILP (Fequal (Vinstallation_directory, Vsource_directory)))
+                    {
+                      Lisp_Object tem2;
+
+                      tem = Fexpand_file_name (build_string ("src/Makefile"),
+                                               Vinstallation_directory);
+                      tem1 = Ffile_exists_p (tem);
+
+                      /* Don't be fooled if they moved the entire source tree
+                         AFTER dumping Emacs.  If the build directory is indeed
+                         different from the source dir, src/Makefile.in and
+                         src/Makefile will not be found together.  */
+                      tem = Fexpand_file_name (build_string ("src/Makefile.in"),
+                                               Vinstallation_directory);
+                      tem2 = Ffile_exists_p (tem);
+                      if (!NILP (tem1) && NILP (tem2))
                         {
-                          tem = Fexpand_file_name (build_string ("site-lisp"),
+                          tem = Fexpand_file_name (build_string ("lisp"),
+                                                   Vsource_directory);
+
+                          if (NILP (Fmember (tem, Vload_path)))
+                            Vload_path = Fcons (tem, Vload_path);
+
+                          tem = Fexpand_file_name (build_string ("leim"),
                                                    Vsource_directory);
 
                           if (NILP (Fmember (tem, Vload_path)))
                             Vload_path = Fcons (tem, Vload_path);
+
+                          if (!no_site_lisp)
+                            {
+                              tem = Fexpand_file_name (build_string ("site-lisp"),
+                                                       Vsource_directory);
+
+                              if (NILP (Fmember (tem, Vload_path)))
+                                Vload_path = Fcons (tem, Vload_path);
+                            }
                         }
-                    }
-                }
+                    } /* Vinstallation_directory != Vsource_directory */
+                }     /* if Vinstallation_directory */
               if (!NILP (sitelisp) && !no_site_lisp)
                 Vload_path = nconc2 (Fnreverse (sitelisp), Vload_path);
-            }
-        }
+            } /* if Vinstallation_directory || no_site_lisp */
+        }     /* if dump_path == Vload_path */
     }
-  else
+  else                          /* !initialized */
     {
       /* NORMAL refers to the lisp dir in the source directory.  */
       /* We used to add ../lisp at the front here, but
@@ -4250,7 +4297,7 @@ init_lread (void)
       Vload_path = decode_env_path (0, normal);
       dump_path = Vload_path;
     }
-#endif
+#endif  /* CANNOT_DUMP */
 
 #if (!(defined (WINDOWSNT) || (defined (HAVE_NS))))
   /* When Emacs is invoked over network shares on NT, PATH_LOADSEARCH is
@@ -4258,6 +4305,8 @@ init_lread (void)
      confuses users.  Since PATH_LOADSEARCH is always overridden by the
      EMACSLOADPATH environment variable below, disable the warning on NT.  */
 
+  /* HAVE_NS also uses EMACSLOADPATH.  */
+
   /* Warn if dirs in the *standard* path don't exist.  */
   if (!turn_off_warning)
     {
@@ -4272,6 +4321,10 @@ init_lread (void)
           if (STRINGP (dirfile))
             {
               dirfile = Fdirectory_file_name (dirfile);
+              /* Do we really need to warn about missing site-lisp dirs?
+                 It's true that the installation should have created
+                 them and added subdirs.el, but it's harmless if they
+                 are not there.  */
               if (access (SSDATA (dirfile), 0) < 0)
                 dir_warning ("Warning: Lisp directory `%s' does not exist.\n",
                              XCAR (path_tail));