From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 31 Mar 2011 15:17:06 +0000 (-0400)
Subject: * lisp/loadup.el: Load minibuffer after loaddefs, to use define-minor-mode.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~445
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c82b2579f0d0abc7cfe75f9f29bc2c7010473878;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c42864ae30..32e9c92a255 100644
--- 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 b884adb5b1e..8a11a6e3e06 100644
--- 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")