* lisp/loadup.el: Load minibuffer after loaddefs, to use define-minor-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c42864ae30e050050c0f8d11de62c11861afa5b..32e9c92a2553e19890e531057796042f7ecf9881 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * loadup.el: Load minibuffer after loaddefs, to use define-minor-mode.
+
 2011-03-31  Tassilo Horn  <tassilo@member.fsf.org>
 
        * net/rcirc.el (rcirc-handler-001): Only authenticate, if there's

diff --git a/lisp/loadup.el b/lisp/loadup.el
index b884adb5b1ef86517a7352f8bbd32d2d61b162d5..8a11a6e3e06fd576d5927bc59ac72f6680763cd8 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -106,7 +106,6 @@
 
 (load "cus-face")
 (load "faces")  ; after here, `defface' may be used.
-(load "minibuffer")
 
 (load "button")
 (load "startup")
@@ -117,6 +116,7 @@
   ;; In case loaddefs hasn't been generated yet.
   (file-error (load "ldefs-boot.el")))
 
+(load "minibuffer")
 (load "abbrev")         ;lisp-mode.el and simple.el use define-abbrev-table.
 (load "simple")