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.

2 files changed, 21 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fec0a0e41d7..f8d290774fc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-07  Glenn Morris  <rgm@gnu.org>
+
+        * 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  <cyd@gnu.org>
 
         * minibuf.c (Fread_from_minibuffer): Doc fix (Bug#10228).
diff --git a/src/lread.c b/src/lread.c
index cdbd09d2f89..582d8f46638 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4180,13 +4180,16 @@ init_lread (void)
                 }
 
               /* 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 @@ init_lread (void)
                       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)