diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-10-27 13:21:21 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-10-27 13:21:21 -0400 |
| commit | 2aaced16866f8b17ee109a0c5682b3896e713f5c (patch) | |
| tree | 28ae345c18b03bac46f962b5a1036103b4896edd /lisp/loadup.el | |
| parent | 113ff954dbcd24325bd674b7294d54a7c8394d42 (diff) | |
| download | emacs-2aaced16866f8b17ee109a0c5682b3896e713f5c.tar.gz emacs-2aaced16866f8b17ee109a0c5682b3896e713f5c.tar.bz2 emacs-2aaced16866f8b17ee109a0c5682b3896e713f5c.zip | |
* lisp/loadup.el: Load minibuffer after cl-generic
This is so minibuffer.el can make use of cl-generic
* lisp/minibuffer.el (minibuffer-local-completion-map):
Move switch-to-completions bindings here from...
* lisp/simple.el (minibuffer-local-completion-map): ... here.
Diffstat (limited to 'lisp/loadup.el')
| -rw-r--r-- | lisp/loadup.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el index e60922e380a..0246dc10262 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -195,7 +195,6 @@ (load "emacs-lisp/nadvice") (load "emacs-lisp/cl-preloaded") -(load "minibuffer") ;After loaddefs, for define-minor-mode. (load "obarray") ;abbrev.el is implemented in terms of obarrays. (load "abbrev") ;lisp-mode.el and simple.el use define-abbrev-table. (load "simple") @@ -247,6 +246,7 @@ (load "indent") (load "emacs-lisp/cl-generic") +(load "minibuffer") ;Needs cl-generic (and define-minor-mode). (load "frame") (load "startup") (load "term/tty-colors") @@ -390,10 +390,9 @@ lost after dumping"))) (let* ((base (concat "emacs-" emacs-version ".")) (exelen (if (eq system-type 'windows-nt) -4)) (files (file-name-all-completions base default-directory)) - (versions (mapcar (function - (lambda (name) - (string-to-number - (substring name (length base) exelen)))) + (versions (mapcar (lambda (name) + (string-to-number + (substring name (length base) exelen))) files))) (setq emacs-repository-version (ignore-errors (emacs-repository-get-version)) emacs-repository-branch (ignore-errors (emacs-repository-get-branch))) |