summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-05-20 17:22:58 -0700
committerGlenn Morris <rgm@gnu.org>2010-05-20 17:22:58 -0700
commit969e684aa5751c8f7a54b08038c26b407b60e12d (patch)
tree649d48fa2b59bcf5976c118f44413897ce8cc1a8 /lisp
parenta50878fabd9b1b8111ffbf458bf56bf4dc9094f8 (diff)
downloademacs-969e684aa5751c8f7a54b08038c26b407b60e12d.tar.gz
Minor loadup.el fix.
* lisp/loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer having a relative path in src/Makefile.in.
Diffstat (limited to 'lisp')
-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 @@
+2010-05-21 Glenn Morris <rgm@gnu.org>
+
+ * loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer
+ having a relative path in src/Makefile.in.
+
2010-05-20 Kevin Ryde <user42@zip.com.au>
* 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 @@
(equal (nth 3 command-line-args) "unidata-gen.el")
(equal (nth 4 command-line-args) "unidata-gen-files")
;; In case CANNOT_DUMP.
- (equal (nth 0 command-line-args) "../src/bootstrap-emacs"))
+ (string-match "src/bootstrap-emacs" (nth 0 command-line-args)))
(let ((dir (car load-path)))
;; We'll probably overflow the pure space.
(setq purify-flag nil)