procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/loadup.el: Load minibuffer after cl-generic

Browse source 
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.
This commit is contained in:
Stefan Monnier 2019-10-27 13:21:21 -04:00
parent 113ff954db
commit 2aaced1686
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/loadup.el
View file

@ -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)))

2
lisp/minibuffer.el
View file

@ -2251,6 +2251,8 @@ The completion method is determined by `completion-at-point-functions'."
;; (define-key map "\e\t" 'minibuffer-force-complete)
(define-key map " " 'minibuffer-complete-word)
(define-key map "?" 'minibuffer-completion-help)
(define-key map [prior] 'switch-to-completions)
(define-key map "\M-v" 'switch-to-completions)
map)
"Local keymap for minibuffer input with completion.")

7
lisp/simple.el
View file

@ -3336,7 +3336,7 @@ to `shell-command-history'."
(shell-completion-vars)
(set (make-local-variable 'minibuffer-default-add-function)
'minibuffer-default-add-shell-commands))
(apply 'read-from-minibuffer prompt initial-contents
(apply #'read-from-minibuffer prompt initial-contents
minibuffer-local-shell-command-map
nil
(or hist 'shell-command-history)
@ -8494,10 +8494,7 @@ Called from `temp-buffer-show-hook'."
"In this buffer, type \\[choose-completion] to \
select the completion near point.\n\n"))))))
(add-hook 'completion-setup-hook 'completion-setup-function)
(define-key minibuffer-local-completion-map [prior] 'switch-to-completions)
(define-key minibuffer-local-completion-map "\M-v" 'switch-to-completions)
(add-hook 'completion-setup-hook #'completion-setup-function)
(defun switch-to-completions ()
"Select the completion list window."