(custom-face-attributes): Handle mapping `nil' and `unspecified' to

[gnu-emacs] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index d97613f94b1c4f6f86aaafa94fddd99a279f65bf..237ed920f601fdab2c5aecdbd8ca8e5acc8445a3 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -31,7 +31,9 @@
 ;; add subdirectories to the load-path for files that might
 ;; get autoloaded when bootstrapping
 (if (or (equal (nth 3 command-line-args) "bootstrap")
-       (equal (nth 4 command-line-args) "bootstrap"))
+       (equal (nth 4 command-line-args) "bootstrap")
+       ;; in case CANNOT_DUMP
+       (equal (nth 0 command-line-args) "../src/bootstrap-emacs"))
     (let ((path (car load-path)))
       (setq load-path (list path
                            (expand-file-name "emacs-lisp" path)