("faces"): Move load before loading "loaddefs.el".

("button"): New load, just before "help" (which uses it).

diff --git a/lisp/loadup.el b/lisp/loadup.el
index dc91a6b086e0bfaff55e31114ecd46d930971d68..729da92182f029a17045f893118855e19ec62bb1 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -64,13 +64,18 @@
 (load "simple")
 (load "files")
 
+(load "faces")  ; after here, `defface' may be used.
+
 (message "Lists of integers (garbage collection statistics) are normal output")
 (message "while building Emacs; they do not indicate a problem.")
 (message "%s" (garbage-collect))
 (load "loaddefs.el")  ;Don't get confused if someone compiled this by mistake.
 (message "%s" (garbage-collect))
 
+(load "button") ; used by help
+
 (load "help")
+
 ;; Any Emacs Lisp source file (*.el) loaded here after can contain
 ;; multilingual text.
 (load "international/mule-cmds")
@@ -112,7 +117,7 @@
 (load "window")
 (load "frame")
 (load "term/tty-colors")
-(load "faces")
+
 (if (fboundp 'frame-face-alist)
     (progn
       (load "facemenu")))