[Emacs-diffs] /srv/bzr/emacs/trunk r109815: init_lread fix for bug#12302

[Glenn Morris]

------------------------------------------------------------
revno: 109815
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-08-29 20:47:33 -0400
message:
  init_lread fix for bug#12302
  
  * src/lread.c (init_lread): For out-of-tree builds, only add the
  source directory's site-lisp dir to the load-path if it exists,
  consistent with in-tree builds.
modified:
  src/ChangeLog
  src/lread.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-28 16:05:17 +0000
+++ b/src/ChangeLog     2012-08-30 00:47:33 +0000
@@ -1,3 +1,9 @@
+2012-08-30  Glenn Morris  <address@hidden>
+
+       * lread.c (init_lread): For out-of-tree builds, only add the
+       source directory's site-lisp dir to the load-path if it exists,
+       consistent with in-tree builds.  (Bug#12302)
+
 2012-08-28  Jan Djärv  <address@hidden>
 
        * nsmenu.m (initWithContentRect:styleMask:backing:defer:): Initialize

=== modified file 'src/lread.c'
--- a/src/lread.c       2012-08-21 23:39:56 +0000
+++ b/src/lread.c       2012-08-30 00:47:33 +0000
@@ -4253,9 +4253,12 @@
                         {
                           tem = Fexpand_file_name (build_string ("site-lisp"),
                                                    Vsource_directory);
-
-                          if (NILP (Fmember (tem, Vload_path)))
-                            Vload_path = Fcons (tem, Vload_path);
+                          tem1 = Ffile_exists_p (tem);
+                          if (!NILP (tem1))
+                            {
+                              if (NILP (Fmember (tem, Vload_path)))
+                                Vload_path = Fcons (tem, Vload_path);
+                            }
                         }
                     }
                 } /* Vinstallation_directory != Vsource_directory */