[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117906: * lisp/emacs-lisp/lisp.el (lisp-completion-
From: |
Dmitry Gutov |
Subject: |
[Emacs-diffs] trunk r117906: * lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Don't use |
Date: |
Fri, 19 Sep 2014 17:33:18 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117906
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Fri 2014-09-19 21:33:11 +0400
message:
* lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Don't use
`lisp--local-variables-completion-table' in the `lisp--form-quoted-p'
case.
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-09-19 03:41:42 +0000
+++ b/lisp/ChangeLog 2014-09-19 17:33:11 +0000
@@ -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 <address@hidden>
=== modified file 'lisp/emacs-lisp/lisp.el'
--- a/lisp/emacs-lisp/lisp.el 2014-09-19 03:41:42 +0000
+++ b/lisp/emacs-lisp/lisp.el 2014-09-19 17:33:11 +0000
@@ -979,18 +979,13 @@
: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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117906: * lisp/emacs-lisp/lisp.el (lisp-completion-at-point): Don't use,
Dmitry Gutov <=