(diary-face, holiday-face): Add dark-background variants.

[bpt/emacs.git] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index e4bca95..237ed92 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)
@@ -52,6 +54,7 @@
 (load "custom")
 (autoload '\` "emacs-lisp/backquote" nil nil 'macro)
 (load "map-ynp")
+(load "env")
 (load "cus-start")
 (load "international/mule")
 (load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake.
@@ -59,13 +62,7 @@
 (load "bindings")
 (setq load-source-file-function 'load-with-code-conversion)
 (load "simple")
-(load "help")
 (load "files")
-;; Any Emacs Lisp source file (*.el) loaded here after can contain
-;; multilingual text.
-(load "international/mule-cmds")
-(load "case-table")
-(load "international/characters")
 
 (message "Lists of integers (garbage collection statistics) are normal output")
 (message "while building Emacs; they do not indicate a problem.")
@@ -73,6 +70,13 @@
 (load "loaddefs.el")  ;Don't get confused if someone compiled this by mistake.
 (message "%s" (garbage-collect))
 
+(load "help")
+;; Any Emacs Lisp source file (*.el) loaded here after can contain
+;; multilingual text.
+(load "international/mule-cmds")
+(load "case-table")
+(load "international/characters")
+
 (let ((set-case-syntax-set-multibyte t))
   (load "international/latin-1")
   (load "international/latin-2")
@@ -104,9 +108,9 @@
 (update-coding-systems-internal)
 
 (load "indent")
-(load "isearch")
 (load "window")
 (load "frame")
+(load "term/tty-colors")
 (load "faces")
 (if (fboundp 'frame-face-alist)
     (progn
@@ -117,6 +121,7 @@
       (and (boundp 'x-toolkit-scroll-bars-p)
           (load "scroll-bar"))
       (load "select")))
+(load "isearch")
 
 (message "%s" (garbage-collect))
 (load "menu-bar")