diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/loadup.el | 2 |
2 files changed, 5 insertions, 1 deletions
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") |