aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-05-20 17:22:58 -0700
committerGlenn Morris2010-05-20 17:22:58 -0700
commit969e684aa5751c8f7a54b08038c26b407b60e12d (patch)
tree649d48fa2b59bcf5976c118f44413897ce8cc1a8
parenta50878fabd9b1b8111ffbf458bf56bf4dc9094f8 (diff)
downloademacs-969e684aa5751c8f7a54b08038c26b407b60e12d.tar.gz
emacs-969e684aa5751c8f7a54b08038c26b407b60e12d.zip
Minor loadup.el fix.
* lisp/loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer having a relative path in src/Makefile.in.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/loadup.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6aebdd8f13..de5fd0477c2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-05-21 Glenn Morris <rgm@gnu.org>
2
3 * loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer
4 having a relative path in src/Makefile.in.
5
12010-05-20 Kevin Ryde <user42@zip.com.au> 62010-05-20 Kevin Ryde <user42@zip.com.au>
2 7
3 * help-mode.el (help-make-xrefs): For Info node links turn 8 * help-mode.el (help-make-xrefs): For Info node links turn
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 36bf8dea082..b087aa79040 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -54,7 +54,7 @@
54 (equal (nth 3 command-line-args) "unidata-gen.el") 54 (equal (nth 3 command-line-args) "unidata-gen.el")
55 (equal (nth 4 command-line-args) "unidata-gen-files") 55 (equal (nth 4 command-line-args) "unidata-gen-files")
56 ;; In case CANNOT_DUMP. 56 ;; In case CANNOT_DUMP.
57 (equal (nth 0 command-line-args) "../src/bootstrap-emacs")) 57 (string-match "src/bootstrap-emacs" (nth 0 command-line-args)))
58 (let ((dir (car load-path))) 58 (let ((dir (car load-path)))
59 ;; We'll probably overflow the pure space. 59 ;; We'll probably overflow the pure space.
60 (setq purify-flag nil) 60 (setq purify-flag nil)