[Emacs-diffs] /srv/bzr/emacs/trunk r106632: Small init_lread fix for bug#10208

[Glenn Morris]

------------------------------------------------------------
revno: 106632
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2011-12-06 21:16:53 -0500
message:
  Small init_lread fix for bug#10208
  
  * src/lread.c (init_lread): If no_site_lisp, exclude site-lisp/ in
  installation and source directories as well.
modified:
  src/ChangeLog
  src/lread.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-12-06 08:50:46 +0000
+++ b/src/ChangeLog     2011-12-07 02:16:53 +0000
@@ -1,3 +1,8 @@
+2011-12-07  Glenn Morris  <address@hidden>
+
+       * lread.c (init_lread): If no_site_lisp, exclude site-lisp/ in
+       installation and source directories as well.  (Bug#10208)
+
 2011-12-06  Chong Yidong  <address@hidden>
 
        * minibuf.c (Fread_from_minibuffer): Doc fix (Bug#10228).

=== modified file 'src/lread.c'
--- a/src/lread.c       2011-11-27 04:43:11 +0000
+++ b/src/lread.c       2011-12-07 02:16:53 +0000
@@ -4180,13 +4180,16 @@
                }
 
              /* Add site-lisp under the installation dir, if it exists.  */
-             tem = Fexpand_file_name (build_string ("site-lisp"),
-                                      Vinstallation_directory);
-             tem1 = Ffile_exists_p (tem);
-             if (!NILP (tem1))
+             if (!no_site_lisp)
                {
-                 if (NILP (Fmember (tem, Vload_path)))
-                   Vload_path = Fcons (tem, Vload_path);
+                 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 Emacs was not built in the source directory,
@@ -4222,11 +4225,14 @@
                      if (NILP (Fmember (tem, Vload_path)))
                        Vload_path = Fcons (tem, Vload_path);
 
-                     tem = Fexpand_file_name (build_string ("site-lisp"),
-                                              Vsource_directory);
+                     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);
+                         if (NILP (Fmember (tem, Vload_path)))
+                           Vload_path = Fcons (tem, Vload_path);
+                       }
                    }
                }
              if (!NILP (sitelisp) && !no_site_lisp)