From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 16 Dec 2013 22:35:57 +0000 (-0800)
Subject: Fix problems with CANNOT_DUMP and EMACSLOADPATH.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~379
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8fb8c4f3735ac3b1b61bd3472a7ba2ad35d1dad5;p=emacs.git

Fix problems with CANNOT_DUMP and EMACSLOADPATH.

* leim/Makefile.in (RUN_EMACS):
* lisp/Makefile.in (emacs): Add lisp src to EMACSLOADPATH.
* lisp/loadup.el: Check for src/bootstrap-emacs only when Emacs can dump.
Expand dir too, in case it's relative.
* src/lread.c (init_lread): If CANNOT_DUMP, we can't be dumping.
---

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 31b9c376903..fa1612ab034 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix problems with CANNOT_DUMP and EMACSLOADPATH.
+	* Makefile.in (RUN_EMACS): Add lisp src to EMACSLOADPATH.
+
 2013-11-28  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (${leimdir}/leim-list.el):
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 383c521504f..33d68b797d2 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -34,8 +34,8 @@ leimdir = ${srcdir}/../lisp/leim
 EMACS = ../src/emacs
 
 # How to run Emacs.
-# Prevent any setting of EMACSLOADPATH in user environment causing problems.
-RUN_EMACS = EMACSLOADPATH= "${EMACS}" -batch --no-site-file --no-site-lisp
+RUN_EMACS = EMACSLOADPATH='$(srcdir)/../lisp' '$(EMACS)' \
+  -batch --no-site-file --no-site-lisp
 
 MKDIR_P = @MKDIR_P@
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1fe7bd62b04..795aa8026b3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-12-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix problems with CANNOT_DUMP and EMACSLOADPATH.
+	* Makefile.in (emacs): Add lisp src to EMACSLOADPATH.
+	* loadup.el: Check for src/bootstrap-emacs only when Emacs can dump.
+	Expand dir too, in case it's relative.
+
 2013-12-16  Juri Linkov  <juri@jurta.org>
 
 	* desktop.el (desktop-auto-save-timeout): Change default to
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 0cc22839f99..2ac2f3e8d6b 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -105,8 +105,7 @@ COMPILE_FIRST = \
 	$(lisp)/emacs-lisp/autoload.elc
 
 # The actual Emacs command run in the targets below.
-# Prevent any setting of EMACSLOADPATH in user environment causing problems.
-emacs = EMACSLOADPATH= "$(EMACS)" $(EMACSOPT)
+emacs = EMACSLOADPATH='$(lisp)' '$(EMACS)' $(EMACSOPT)
 
 # Common command to find subdirectories
 setwins=for file in `find . -type d -print`; do \
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 520fe4e701e..c6a3e3f0120 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -51,12 +51,13 @@
 	;; FIXME this is irritatingly fragile.
 	(equal (nth 4 command-line-args) "unidata-gen.el")
 	(equal (nth 7 command-line-args) "unidata-gen-files")
-	;; In case CANNOT_DUMP.
-	(string-match "src/bootstrap-emacs" (nth 0 command-line-args)))
+	(if (fboundp 'dump-emacs)
+	    (string-match "src/bootstrap-emacs" (nth 0 command-line-args))
+	  t))
     (let ((dir (car load-path)))
       ;; We'll probably overflow the pure space.
       (setq purify-flag nil)
-      (setq load-path (list dir
+      (setq load-path (list (expand-file-name "." dir)
 			    (expand-file-name "emacs-lisp" dir)
 			    (expand-file-name "language" dir)
 			    (expand-file-name "international" dir)
diff --git a/src/ChangeLog b/src/ChangeLog
index e2ff15e4291..36378fd911e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix problems with CANNOT_DUMP and EMACSLOADPATH.
+	* lread.c (init_lread): If CANNOT_DUMP, we can't be dumping.
+
 2013-12-16  Eli Zaretskii  <eliz@gnu.org>
 
 	* xdisp.c (Fmove_point_visually): Fix subtle bugs in the fallback
diff --git a/src/lread.c b/src/lread.c
index 89bce5e7d25..2bada06f2ad 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4293,8 +4293,14 @@ init_lread (void)
 {
   /* First, set Vload_path.  */
 
-  /* We explicitly ignore EMACSLOADPATH when dumping.  */
-  if (NILP (Vpurify_flag) && egetenv ("EMACSLOADPATH"))
+  /* Ignore EMACSLOADPATH when dumping.  */
+#ifdef CANNOT_DUMP
+  bool use_loadpath = true;
+#else
+  bool use_loadpath = !NILP (Vpurify_flag);
+#endif
+
+  if (use_loadpath && egetenv ("EMACSLOADPATH"))
     {
       Vload_path = decode_env_path ("EMACSLOADPATH", 0, 1);