2 files changed, 5 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index aba9846f6a6..d6143d15bde 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-29  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * lread.c (init_lread): Remove if-statement in ifdef HAVE_NS before
+        setting sitelisp (Bug#12010).
+
 2012-07-29  Eli Zaretskii  <eliz@gnu.org>
 
         * w32heap.h (OS_9X): Renamed from OS_WINDOWS_95.
diff --git a/src/lread.c b/src/lread.c
index 39378bb11dd..0db37d7492f 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4121,12 +4121,7 @@ init_lread (void)
    difference between initialized and !initialized in this case,
    so we'll have to do it unconditionally when Vinstallation_directory
    is non-nil.  */
-#ifdef HAVE_NS
-  /* loadpath already includes the app-bundle's site-lisp.  */
-  if (!no_site_lisp && !egetenv ("EMACSLOADPATH") && !loadpath)
-#else
   if (!no_site_lisp && !egetenv ("EMACSLOADPATH"))
-#endif
     {
       Lisp_Object sitelisp;
       sitelisp = decode_env_path (0, PATH_SITELOADSEARCH);
@@ -4270,12 +4265,7 @@ init_lread (void)
           load_path_check ();
 
           /* Add the site-lisp directories at the front.  */
-#ifdef HAVE_NS
-          /* loadpath already includes the app-bundle's site-lisp.  */
-          if (!no_site_lisp && !loadpath)
-#else
           if (!no_site_lisp)
-#endif
             {
               Lisp_Object sitelisp;
               sitelisp = decode_env_path (0, PATH_SITELOADSEARCH);