diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2014-02-06 03:22:38 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2014-02-06 03:22:38 +0200 |
| commit | a333e4d29764e8f086a9fdeeb17c060a5d06d6dc (patch) | |
| tree | 1322123c2999c0ca969dd68ce6f6155b3e51bfd3 /lisp/emacs-lisp/lisp.el | |
| parent | 06c2ec49462474205dbd79a5dbd96bf73367d949 (diff) | |
| download | emacs-a333e4d29764e8f086a9fdeeb17c060a5d06d6dc.tar.gz | |
Define and use `completion-table-merge'
* 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
Diffstat (limited to 'lisp/emacs-lisp/lisp.el')
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 3ff4f64d24c..716df8a4cca 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -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 |