[Emacs-diffs] trunk r116285: * lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Symbols don't start

[Stefan Monnier]

------------------------------------------------------------
revno: 116285
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16664
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2014-02-06 00:37:23 -0500
message:
  * 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).
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/lisp.el        lisp.el-20091113204419-o5vbwnq5f7feedwu-131

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-06 04:05:43 +0000
+++ b/lisp/ChangeLog    2014-02-06 05:37:23 +0000
@@ -1,11 +1,17 @@
+2014-02-06  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * epa.el (epa-mail-aliases): Doc fix.
 
 2014-02-06  Dmitry Gutov  <address@hidden>
 
-       * emacs-lisp/lisp.el (lisp-completion-at-point): Use
-       `completion-table-merge' instead of `completion-table-in-turn'
+       * emacs-lisp/lisp.el (lisp-completion-at-point):
+       Use `completion-table-merge' instead of `completion-table-in-turn'
        (bug#16604).
 
        * minibuffer.el (completion-table-merge): New function.

=== modified file 'lisp/emacs-lisp/lisp.el'
--- a/lisp/emacs-lisp/lisp.el   2014-02-06 01:22:38 +0000
+++ b/lisp/emacs-lisp/lisp.el   2014-02-06 05:37:23 +0000
@@ -815,7 +815,8 @@
                  (scan-error pos)))
           (end
            (unless (or (eq beg (point-max))
-                       (member (char-syntax (char-after beg)) '(?\" ?\( ?\))))
+                       (member (char-syntax (char-after beg))
+                                '(?\s ?\" ?\( ?\))))
              (condition-case nil
                  (save-excursion
                    (goto-char beg)
@@ -832,7 +833,15 @@
                 ;; the macro/function being called.
                 (list nil (completion-table-merge
                            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
                       (lambda (str) (if (fboundp (intern-soft str)) " <f>"))
                       :company-doc-buffer #'lisp--company-doc-buffer