* lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Don't use

`lisp--local-variables-completion-table' in the `lisp--form-quoted-p'
case.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 997071f2dc8ba1786ea3d5bdd0b1df10ca17d382..5725aa924d7d1f094ab1be563b864981da7d28e1 100644 (file)
--- 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 a8bad47a90a3b9ee3739fe9b84abf89a46e4045f..7e5f47b80b7edc394e096be4d0b66210176d2bdd 100644 (file)
--- 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