From: Glenn Morris Date: Fri, 21 May 2010 00:22:58 +0000 (-0700) Subject: Minor loadup.el fix. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~205^2~29 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=969e684aa5751c8f7a54b08038c26b407b60e12d;p=emacs.git Minor loadup.el fix. * lisp/loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer having a relative path in src/Makefile.in. --- 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 + + * loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer + having a relative path in src/Makefile.in. + 2010-05-20 Kevin Ryde * 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)