diff options
| author | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2015-01-28 01:31:15 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2015-01-28 01:31:15 -0300 |
| commit | 5491fd1098d27b3ba3db054076b9ab60fb3558dc (patch) | |
| tree | 65f6f54127714eb9634b83e5d780d75ab7d85252 /lisp/loadup.el | |
| parent | 028ddef7a2b6662ac602ea70d308deecbc69b4db (diff) | |
| parent | 2668ac1aaecfe62c80a4fbdfc27a38e384594d26 (diff) | |
| download | emacs-5491fd1098d27b3ba3db054076b9ab60fb3558dc.tar.gz emacs-5491fd1098d27b3ba3db054076b9ab60fb3558dc.tar.bz2 emacs-5491fd1098d27b3ba3db054076b9ab60fb3558dc.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index 96641c8a268..003b0db4abd 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -145,7 +145,8 @@ (file-error (load "ldefs-boot.el"))) (load "emacs-lisp/nadvice") -(load "minibuffer") +(load "emacs-lisp/cl-preloaded") +(load "minibuffer") ;After loaddefs, for define-minor-mode. (load "abbrev") ;lisp-mode.el and simple.el use define-abbrev-table. (load "simple") |