branch: externals/company
commit 035e38b835f1e1da732026befb4c520e30b77152
Merge: 1a0fc12a9c c627f8e5f5
Author: Dmitry Gutov <[email protected]>
Commit: GitHub <[email protected]>
Merge pull request #1478 from blahgeek/abbrev-tables
abbrev backend: use abbrev--active-tables to get all tables
---
company-abbrev.el | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/company-abbrev.el b/company-abbrev.el
index 74677f46ed..e074d3af4e 100644
--- a/company-abbrev.el
+++ b/company-abbrev.el
@@ -41,9 +41,11 @@
(interactive (company-begin-backend 'company-abbrev
'company-abbrev-insert))
(prefix (company-grab-symbol))
- (candidates (nconc
- (delete "" (all-completions arg global-abbrev-table))
- (delete "" (all-completions arg local-abbrev-table))))
+ (candidates (apply
+ #'nconc
+ (mapcar (lambda (table)
+ (delete "" (all-completions arg table)))
+ (abbrev--active-tables))))
(kind 'snippet)
(meta (abbrev-expansion arg))
(post-completion (expand-abbrev))))
