Commit 29127376 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Symbols don't start

with a space.  Limit the symbols considered to the ones
that are bound or fbound (bug#16646).

Fixes: debbugs:16664
parent 314ffdb1
2014-02-06 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/lisp.el (lisp-completion-at-point): Symbols don't start
with a space (bug#16664). Limit the symbols considered to the ones
that are bound or fbound (bug#16646).
2014-02-06 Glenn Morris <rgm@gnu.org> 2014-02-06 Glenn Morris <rgm@gnu.org>
* epa.el (epa-mail-aliases): Doc fix. * epa.el (epa-mail-aliases): Doc fix.
2014-02-06 Dmitry Gutov <dgutov@yandex.ru> 2014-02-06 Dmitry Gutov <dgutov@yandex.ru>
* emacs-lisp/lisp.el (lisp-completion-at-point): Use * emacs-lisp/lisp.el (lisp-completion-at-point):
`completion-table-merge' instead of `completion-table-in-turn' Use `completion-table-merge' instead of `completion-table-in-turn'
(bug#16604). (bug#16604).
* minibuffer.el (completion-table-merge): New function. * minibuffer.el (completion-table-merge): New function.
......
...@@ -815,7 +815,8 @@ considered." ...@@ -815,7 +815,8 @@ considered."
(scan-error pos))) (scan-error pos)))
(end (end
(unless (or (eq beg (point-max)) (unless (or (eq beg (point-max))
(member (char-syntax (char-after beg)) '(?\" ?\( ?\)))) (member (char-syntax (char-after beg))
'(?\s ?\" ?\( ?\))))
(condition-case nil (condition-case nil
(save-excursion (save-excursion
(goto-char beg) (goto-char beg)
...@@ -832,7 +833,15 @@ considered." ...@@ -832,7 +833,15 @@ considered."
;; the macro/function being called. ;; the macro/function being called.
(list nil (completion-table-merge (list nil (completion-table-merge
lisp--local-variables-completion-table lisp--local-variables-completion-table
obarray) ;Could be anything. (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))
:annotation-function :annotation-function
(lambda (str) (if (fboundp (intern-soft str)) " <f>")) (lambda (str) (if (fboundp (intern-soft str)) " <f>"))
:company-doc-buffer #'lisp--company-doc-buffer :company-doc-buffer #'lisp--company-doc-buffer
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment