[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115557: Fix problems with CANNOT_DUMP and EMACSLOAD
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r115557: Fix problems with CANNOT_DUMP and EMACSLOADPATH. |
Date: |
Mon, 16 Dec 2013 22:36:02 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115557
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2013-12-16 14:35:57 -0800
message:
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.
modified:
leim/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1629
leim/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-1200
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831
lisp/loadup.el loadup.el-20091113204419-o5vbwnq5f7feedwu-49
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/lread.c lread.c-20091113204419-o5vbwnq5f7feedwu-266
=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog 2013-11-28 20:31:55 +0000
+++ b/leim/ChangeLog 2013-12-16 22:35:57 +0000
@@ -1,3 +1,8 @@
+2013-12-16 Paul Eggert <address@hidden>
+
+ Fix problems with CANNOT_DUMP and EMACSLOADPATH.
+ * Makefile.in (RUN_EMACS): Add lisp src to EMACSLOADPATH.
+
2013-11-28 Glenn Morris <address@hidden>
* Makefile.in (${leimdir}/leim-list.el):
=== modified file 'leim/Makefile.in'
--- a/leim/Makefile.in 2013-11-28 23:34:15 +0000
+++ b/leim/Makefile.in 2013-12-16 22:35:57 +0000
@@ -34,8 +34,8 @@
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@
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-12-16 21:48:51 +0000
+++ b/lisp/ChangeLog 2013-12-16 22:35:57 +0000
@@ -1,3 +1,10 @@
+2013-12-16 Paul Eggert <address@hidden>
+
+ 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 <address@hidden>
* desktop.el (desktop-auto-save-timeout): Change default to
=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in 2013-12-11 17:05:28 +0000
+++ b/lisp/Makefile.in 2013-12-16 22:35:57 +0000
@@ -105,8 +105,7 @@
$(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 \
=== modified file 'lisp/loadup.el'
--- a/lisp/loadup.el 2013-12-13 18:25:30 +0000
+++ b/lisp/loadup.el 2013-12-16 22:35:57 +0000
@@ -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)
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-12-16 19:29:04 +0000
+++ b/src/ChangeLog 2013-12-16 22:35:57 +0000
@@ -1,3 +1,8 @@
+2013-12-16 Paul Eggert <address@hidden>
+
+ Fix problems with CANNOT_DUMP and EMACSLOADPATH.
+ * lread.c (init_lread): If CANNOT_DUMP, we can't be dumping.
+
2013-12-16 Eli Zaretskii <address@hidden>
* xdisp.c (Fmove_point_visually): Fix subtle bugs in the fallback
=== modified file 'src/lread.c'
--- a/src/lread.c 2013-12-13 22:27:05 +0000
+++ b/src/lread.c 2013-12-16 22:35:57 +0000
@@ -4293,8 +4293,14 @@
{
/* 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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115557: Fix problems with CANNOT_DUMP and EMACSLOADPATH.,
Paul Eggert <=