summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/loadup.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 53b5713a1a6..b8b54ab8107 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-12 Eli Zaretskii <eliz@gnu.org>
+
+ * loadup.el ("minibuffer"): Move after "faces".
+
2008-04-12 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/hideif.el (hif-factor): Handle unary minus.
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 8581f05fedb..005c5ea25b8 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -67,13 +67,13 @@
(load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake.
(load "env")
(load "format")
-(load "minibuffer")
(load "bindings")
(setq load-source-file-function 'load-with-code-conversion)
(load "files")
(load "cus-face")
(load "faces") ; after here, `defface' may be used.
+(load "minibuffer")
(load "button")
(load "startup")