[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master be2f586 100/173: Add workaround for bug#18067
From: |
Dmitry Gutov |
Subject: |
[elpa] master be2f586 100/173: Add workaround for bug#18067 |
Date: |
Thu, 23 Jun 2016 00:28:42 +0000 (UTC) |
branch: master
commit be2f586fc09c98d19d1e7d6c5854a02ed6716650
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Add workaround for bug#18067
Fixes #440
---
company-capf.el | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/company-capf.el b/company-capf.el
index 0b88e2b..3094ea3 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -48,11 +48,19 @@
;; the latter comes later.
(remove 'tags-completion-at-point-function
(default-value 'completion-at-point-functions)))
+ (completion-at-point-functions (company--capf-workaround))
(data (run-hook-wrapped 'completion-at-point-functions
;; Ignore misbehaving functions.
#'completion--capf-wrapper 'optimist)))
(when (and (consp (cdr data)) (integer-or-marker-p (nth 1 data))) data)))
+(defun company--capf-workaround ()
+ ;; For http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18067
+ (if (or (not (memq 'python-completion-at-point
completion-at-point-functions))
+ (python-shell-get-process))
+ completion-at-point-functions
+ (remq 'python-completion-at-point completion-at-point-functions)))
+
(defun company-capf (command &optional arg &rest _args)
"`company-mode' backend using `completion-at-point-functions'."
(interactive (list 'interactive))
- [elpa] master 5d0a9bb 118/173: company-semantic: Retain function overloads, (continued)
- [elpa] master 5d0a9bb 118/173: company-semantic: Retain function overloads, Dmitry Gutov, 2016/06/22
- [elpa] master ca447ec 129/173: [#464] Optimisation and fixes in `company-files`, Dmitry Gutov, 2016/06/22
- [elpa] master b526978 133/173: Fix typo in dependency name, Dmitry Gutov, 2016/06/22
- [elpa] master 39eb115 113/173: company--posn-col-row: Fall back to posn-col-row, Dmitry Gutov, 2016/06/22
- [elpa] master ae0a406 139/173: Add some C++11 keywords, fixes #478, Dmitry Gutov, 2016/06/22
- [elpa] master 9b89556 149/173: company-capf: Look up `face', not `font-lock-face', Dmitry Gutov, 2016/06/22
- [elpa] master d587bd0 156/173: Fix an old typo, Dmitry Gutov, 2016/06/22
- [elpa] master 2d9bf1e 160/173: company--preprocess-candidates: Check that all CANDIDATES are strings, Dmitry Gutov, 2016/06/22
- [elpa] master 395f846 159/173: Revert "Remove completions without annotations when considering duplicates", Dmitry Gutov, 2016/06/22
- [elpa] master 69228c7 168/173: Tag company-dabbrev-ignore-buffers with package-version, Dmitry Gutov, 2016/06/22
- [elpa] master be2f586 100/173: Add workaround for bug#18067,
Dmitry Gutov <=
- [elpa] master df14727 110/173: Fix bbdb completion for multi-recipient messages, Dmitry Gutov, 2016/06/22
- [elpa] master 18a77b9 121/173: Improve the example in the Commentary, Dmitry Gutov, 2016/06/22
- [elpa] master c97828c 142/173: Clarify where callback must be called from, Dmitry Gutov, 2016/06/22
- [elpa] master 4cd4c3a 123/173: Turn :company-prefix-length property into a value, Dmitry Gutov, 2016/06/22
- [elpa] master 18b0414 103/173: Declare python-shell-get-process, Dmitry Gutov, 2016/06/22
- [elpa] master 23c6f85 109/173: Merge pull request #450 from fbergroth/capf-prefix-function, Dmitry Gutov, 2016/06/22
- [elpa] master 5bfbb05 098/173: Add the pre-render backend command, Dmitry Gutov, 2016/06/22
- [elpa] master 3ec9d5d 145/173: Add Julia keywords, Dmitry Gutov, 2016/06/22
- [elpa] master 900ae0d 096/173: Add support for company-face, Dmitry Gutov, 2016/06/22
- [elpa] master 1221739 122/173: Improve the description of cons prefix, Dmitry Gutov, 2016/06/22