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

Define and use `completion-table-merge'

Browse source 
* lisp/minibuffer.el (completion-table-merge): New function.

* lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Use
`completion-table-merge' instead of `completion-table-in-turn'.

Fixes: debbugs:16604
This commit is contained in:
Dmitry Gutov 2014-02-06 03:22:38 +02:00
parent 06c2ec4946
commit a333e4d297
5 changed files with 46 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/emacs-lisp/lisp.el
View file

@ -830,7 +830,7 @@ considered."
;; use it to provide a more specific completion table in some
;; cases. E.g. filter out keywords that are not understood by
;; the macro/function being called.
(list nil (completion-table-in-turn
(list nil (completion-table-merge
lisp--local-variables-completion-table
obarray) ;Could be anything.
:annotation-function