diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2014-09-19 21:33:11 +0400 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2014-09-19 21:33:11 +0400 |
| commit | a58c2690db26d69112d97122c6eb91d8906f7476 (patch) | |
| tree | a287b38ea491e3d312ab8d4059d14e6af84eba44 | |
| parent | 3907574bb864de9a9020af11c30ec0b48588fc13 (diff) | |
| download | emacs-a58c2690db26d69112d97122c6eb91d8906f7476.tar.gz | |
* lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Don't use
`lisp--local-variables-completion-table' in the `lisp--form-quoted-p'
case.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 19 |
2 files changed, 10 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 997071f2dc8..5725aa924d7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -5,6 +5,9 @@ (lisp-completion-at-point): Move `end' back if it's after quote. If in comment or string, only complete when after backquote. (Bug#18265) + (lisp-completion-at-point): Don't use + `lisp--local-variables-completion-table' in the + `lisp--form-quoted-p' case. 2014-09-19 Dmitry Gutov <dgutov@yandex.ru> diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index a8bad47a90a..7e5f47b80b7 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -979,18 +979,13 @@ It can be quoted, or be inside a quoted form." :company-docsig #'lisp--company-doc-string :company-location #'lisp--company-location)) ((lisp--form-quoted-p beg) - (list nil (completion-table-merge - ;; FIXME: Is this table useful for this case? - lisp--local-variables-completion-table - (apply-partially #'completion-table-with-predicate - obarray - ;; Don't include all symbols - ;; (bug#16646). - (lambda (sym) - (or (boundp sym) - (fboundp sym) - (symbol-plist sym))) - 'strict)) + (list nil obarray + ;; Don't include all symbols + ;; (bug#16646). + :predicate (lambda (sym) + (or (boundp sym) + (fboundp sym) + (symbol-plist sym))) :annotation-function (lambda (str) (if (fboundp (intern-soft str)) " <f>")) :company-doc-buffer #'lisp--company-doc-buffer |