[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 5fe2c23 04/23: Consider any frontend deriving from company
From: |
Dmitry Gutov |
Subject: |
[elpa] master 5fe2c23 04/23: Consider any frontend deriving from company-preview-frontend |
Date: |
Fri, 11 Nov 2016 22:21:41 +0000 (UTC) |
branch: master
commit 5fe2c2369afa14adb62052c6d61f2b202a474112
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Consider any frontend deriving from company-preview-frontend
...or and least those that use the same variable for the overlay.
Closes #547.
---
NEWS.md | 5 +++++
company.el | 9 +++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index 758f0be..68a7512 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,10 @@
# History of user-visible changes
+## Next
+
+* `company-pseudo-tooltip-unless-just-one-frontend-with-delay` handles custom
+ frontends derived from `company-preview-frontend` better.
+
## 2016-06-23 (0.9.0)
* Group of backends can now contain keyword `:separate`, which makes candidates
diff --git a/company.el b/company.el
index 42d2486..2b59a2a 100644
--- a/company.el
+++ b/company.el
@@ -2869,6 +2869,7 @@ Returns a negative number if the tooltip should be
displayed above point."
(defun company-pseudo-tooltip-unless-just-one-frontend-with-delay (command)
"`compandy-pseudo-tooltip-frontend', but shown after a delay.
Delay is determined by `company-tooltip-idle-delay'."
+ (defvar company-preview-overlay)
(when (and (memq command '(pre-command hide))
company-tooltip-timer)
(cancel-timer company-tooltip-timer)
@@ -2877,11 +2878,11 @@ Delay is determined by `company-tooltip-idle-delay'."
(post-command
(if (or company-tooltip-timer
(overlayp company-pseudo-tooltip-overlay))
- (if (not (memq 'company-preview-frontend company-frontends))
+ (if (not (overlayp company-preview-overlay))
(company-pseudo-tooltip-unless-just-one-frontend command)
- (company-preview-frontend 'pre-command)
- (company-pseudo-tooltip-unless-just-one-frontend command)
- (company-preview-frontend 'post-command))
+ (let (company-tooltip-timer)
+ (company-call-frontends 'pre-command))
+ (company-call-frontends 'post-command))
(setq company-tooltip-timer
(run-with-timer company-tooltip-idle-delay nil
'company-pseudo-tooltip-unless-just-one-frontend-with-delay
- [elpa] master updated (ec15f45 -> 85bd83e), Dmitry Gutov, 2016/11/11
- [elpa] master 99d2e84 01/23: Cancel the tooltip-with-delay timer on hide, Dmitry Gutov, 2016/11/11
- [elpa] master 05a934b 02/23: Simplify, Dmitry Gutov, 2016/11/11
- [elpa] master 5fe2c23 04/23: Consider any frontend deriving from company-preview-frontend,
Dmitry Gutov <=
- [elpa] master d3032e2 06/23: company-next-page: Wrap only when at the last item, Dmitry Gutov, 2016/11/11
- [elpa] master 63d4332 07/23: Reword, Dmitry Gutov, 2016/11/11
- [elpa] master e53f150 05/23: Mention the previous change, too, Dmitry Gutov, 2016/11/11
- [elpa] master 8e321eb 03/23: Auto-adjust company-idle-delay when it's zero, Dmitry Gutov, 2016/11/11
- [elpa] master 3d369e1 11/23: Don't convert user-error signals to error (#560), Dmitry Gutov, 2016/11/11
- [elpa] master 86c1f60 10/23: company-dabbrev-code: Look inside comments and strings when appropriate, Dmitry Gutov, 2016/11/11
- [elpa] master ac2606a 18/23: Add JSX modes to javascript aliases, Dmitry Gutov, 2016/11/11
- [elpa] master fc39277 15/23: Add keywords for rust-mode to company-keywords., Dmitry Gutov, 2016/11/11
- [elpa] master f78f9c1 21/23: Initialize grouped backends on the fly as well, Dmitry Gutov, 2016/11/11
- [elpa] master e6689ea 12/23: company-files--directory-files: Swallow file-error, Dmitry Gutov, 2016/11/11