[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master c51df8f 76/78: Fix #760 in a different way
From: |
Dmitry Gutov |
Subject: |
[elpa] master c51df8f 76/78: Fix #760 in a different way |
Date: |
Sun, 18 Feb 2018 07:40:30 -0500 (EST) |
branch: master
commit c51df8fce046b089f825fb5f21e3d51aa76b6941
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Fix #760 in a different way
Without clobbering idle completion after interrupted async
---
company.el | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/company.el b/company.el
index 915f1bd..dc9c37b 100644
--- a/company.el
+++ b/company.el
@@ -1238,11 +1238,16 @@ can retrieve meta-data for them."
(cdr c)
(lambda (candidates)
(when (eq res 'none)
- (push 'company-dummy-event unread-command-events))
+ (push 'company-foo unread-command-events))
(setq res candidates)))
(while (and (eq res 'none)
(sit-for 0.5 t)))
- (and (consp res) res)))))
+ (while (member (car unread-command-events)
+ '(company-foo (t . company-foo)))
+ (pop unread-command-events))
+ (prog1
+ (and (consp res) res)
+ (setq res 'exited))))))
(defun company--preprocess-candidates (candidates)
(cl-assert (cl-every #'stringp candidates))
- [elpa] master 098a907 35/78: Nah, (continued)
- [elpa] master 098a907 35/78: Nah, Dmitry Gutov, 2018/02/18
- [elpa] master 27316ec 33/78: Try 'emacs', Dmitry Gutov, 2018/02/18
- [elpa] master 4884a5e 44/78: Fall back to earlier behavior with Clang < 4.0, Dmitry Gutov, 2018/02/18
- [elpa] master 157e8af 55/78: company-etags: Don't set tags-file-name globally, Dmitry Gutov, 2018/02/18
- [elpa] master 3b14294 56/78: Remove dup, Dmitry Gutov, 2018/02/18
- [elpa] master fd9a0fb 53/78: defcustom: prefer t instead of (meaningless) descriptive symbols, Dmitry Gutov, 2018/02/18
- [elpa] master 63ab036 62/78: Clean the annotation string before stripping it, Dmitry Gutov, 2018/02/18
- [elpa] master a870b69 24/78: Merge pull request #712 from nikital/tng-defaults, Dmitry Gutov, 2018/02/18
- [elpa] master 24e2aa7 36/78: Change to container-based Travis-CI build, Dmitry Gutov, 2018/02/18
- [elpa] master 4a8289d 50/78: Merge pull request #751 from jojojames/kotlin-keywords, Dmitry Gutov, 2018/02/18
- [elpa] master c51df8f 76/78: Fix #760 in a different way,
Dmitry Gutov <=
- [elpa] master 285419b 66/78: Add a NEWS entry, Dmitry Gutov, 2018/02/18
- [elpa] master bf94032 68/78: More NEWS entries, Dmitry Gutov, 2018/02/18
- [elpa] master 0284f41 67/78: Merge branch 'simpler-async', Dmitry Gutov, 2018/02/18
- [elpa] master aaae46b 74/78: M-x copyright-update, Dmitry Gutov, 2018/02/18
- [elpa] master 66e43a3 31/78: Add interactive tags and skip-unless, Dmitry Gutov, 2018/02/18
- [elpa] master cb2ae50 38/78: Don't restart semantics after ::, Dmitry Gutov, 2018/02/18
- [elpa] master 75b4daa 37/78: Merge pull request #737 from iquiw/container-based-ci, Dmitry Gutov, 2018/02/18
- [elpa] master 0f70fee 47/78: Add keywords for swift-mode, Dmitry Gutov, 2018/02/18
- [elpa] master 10807eb 48/78: Merge pull request #750 from jojojames/master, Dmitry Gutov, 2018/02/18
- [elpa] master 556fe45 45/78: Specify type, Dmitry Gutov, 2018/02/18