Fixed a bug in w32-long-file-name.

[gnu-emacs] / src / lread.c

diff --git a/src/lread.c b/src/lread.c
index dceeb43dff4452e3399d6444799f9ca63c53749e..a64f083a5acbde2cb113f2493e8714757283d5b4 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -3537,7 +3537,7 @@ read_vector (Lisp_Object readcharfun, bool bytecodeflag)
   return vector;
 }
 
-/* FLAG means check for ] to terminate rather than ) and .  */
+/* FLAG means check for ']' to terminate rather than ')' and '.'.  */
 
 static Lisp_Object
 read_list (bool flag, Lisp_Object readcharfun)
@@ -4157,16 +4157,14 @@ static Lisp_Object dump_path;
    are not yet installed, we should not use them, even if they exist.)
    If installation-dir/lisp does not exist, just 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.
-*/
-Lisp_Object
+   check), then repeat the above steps for source-dir/lisp, site-lisp.  */
+
+static Lisp_Object
 load_path_default (bool changed)
 {
   Lisp_Object lpath = Qnil;
@@ -4195,6 +4193,14 @@ load_path_default (bool changed)
      changed from the default that was saved before dumping, don't
      change it further.  Changes can only be due to site-lisp
      files that were processed during dumping.  */
+  /* FIXME?  AFAICS, it does not make sense to change load-path in a
+     dumped site-lisp file, so maybe we should just drop this check.
+     E.g., if you add an element to load-path, you are going to be
+     adding it to PATH_DUMPLOADSEARCH, which refers to the source directory.
+     This will make no sense (and may not still exist) in an installed Emacs.
+     And the only change it is sensible to make to load-path is to add
+     something to the front, which you should do with configure's
+     --enable-locallisppath option if you really want to have it dumped.  */
   if (initialized)
     {
       if (changed || NILP (Fequal (dump_path, Vload_path)))
@@ -4225,9 +4231,9 @@ load_path_default (bool changed)
                   if (NILP (Fmember (tem, lpath)))
                     {
                       /* We are running uninstalled.  The default load-path
-                         points to the eventual installed lisp, leim
-                         directories.  We should not use those now, even
-                         if they exist, so start over from a clean slate.  */
+                         points to the eventual installed lisp directories.
+                         We should not use those now, even if they exist,
+                         so start over from a clean slate.  */
                       lpath = list1 (tem);
                     }
                 }
@@ -4236,16 +4242,6 @@ load_path_default (bool changed)
                    Lisp dirs instead.  */
                 lpath = nconc2 (lpath, dump_path);
 
-              /* Add leim under the installation dir, if it is accessible. */
-              tem = Fexpand_file_name (build_string ("leim"),
-                                       Vinstallation_directory);
-              tem1 = Ffile_accessible_directory_p (tem);
-              if (!NILP (tem1))
-                {
-                  if (NILP (Fmember (tem, lpath)))
-                    lpath = Fcons (tem, lpath);
-                }
-
               /* Add site-lisp under the installation dir, if it exists.  */
               if (!no_site_lisp)
                 {
@@ -4261,7 +4257,7 @@ load_path_default (bool changed)
 
               /* 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.  */
+                 the lisp and site-lisp dirs under that directory.  */
 
               if (NILP (Fequal (Vinstallation_directory, Vsource_directory)))
                 {
@@ -4286,12 +4282,6 @@ load_path_default (bool changed)
                       if (NILP (Fmember (tem, lpath)))
                         lpath = Fcons (tem, lpath);
 
-                      tem = Fexpand_file_name (build_string ("leim"),
-                                               Vsource_directory);
-
-                      if (NILP (Fmember (tem, lpath)))
-                        lpath = Fcons (tem, lpath);
-
                       if (!no_site_lisp)
                         {
                           tem = Fexpand_file_name (build_string ("site-lisp"),