[Emacs-diffs] /srv/bzr/emacs/trunk r100393: Minor loadup.el fix.

[Glenn Morris]

------------------------------------------------------------
revno: 100393
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-20 17:22:58 -0700
message:
  Minor loadup.el fix.
  * lisp/loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer
  having a relative path in src/Makefile.in.
modified:
  lisp/ChangeLog
  lisp/loadup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-20 23:54:55 +0000
+++ b/lisp/ChangeLog    2010-05-21 00:22:58 +0000
@@ -1,3 +1,8 @@
+2010-05-21  Glenn Morris  <address@hidden>
+
+       * loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer
+       having a relative path in src/Makefile.in.
+
 2010-05-20  Kevin Ryde  <address@hidden>
 
        * help-mode.el (help-make-xrefs): For Info node links turn

=== modified file 'lisp/loadup.el'
--- a/lisp/loadup.el    2010-04-20 18:52:07 +0000
+++ b/lisp/loadup.el    2010-05-21 00:22:58 +0000
@@ -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)