[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 20fe015 18/31: Merge pull request #874 from amosbird/maste
From: |
Dmitry Gutov |
Subject: |
[elpa] master 20fe015 18/31: Merge pull request #874 from amosbird/master |
Date: |
Sun, 14 Apr 2019 22:06:18 -0400 (EDT) |
branch: master
commit 20fe01542bf7665ba90f9fe1a86cbe0eea4d9f8a
Merge: edbb3c5 ebc4fce
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>
Merge pull request #874 from amosbird/master
Make company-idle-delay support predicate function
---
NEWS.md | 2 ++
company.el | 30 +++++++++++++++++-------------
2 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index aedac18..5391bb5 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,8 @@
## Next
+* `company-idle-delay` now accepts a function which generates the idle time or
+ nil indicating no idle completion.
* Add custom variable `company-show-numbers-function` to make numbers of
candidates customizable.
* When a symbol is already typed in full, calling `M-x company-complete` will
diff --git a/company.el b/company.el
index 728c42d..71f3756 100644
--- a/company.el
+++ b/company.el
@@ -584,6 +584,7 @@ The prefix still has to satisfy
`company-minimum-prefix-length' before that
happens. The value of nil means no idle completion."
:type '(choice (const :tag "never (nil)" nil)
(const :tag "immediate (0)" 0)
+ (function :tag "Predicate function")
(number :tag "seconds")))
(defcustom company-tooltip-idle-delay .5
@@ -1702,25 +1703,28 @@ prefix match (same case) will be prioritized."
(company--perform)))
(if company-candidates
(company-call-frontends 'post-command)
- (and (or (numberp company-idle-delay)
- ;; Deprecated.
- (eq company-idle-delay t))
- (not defining-kbd-macro)
- (company--should-begin)
- (setq company-timer
- (run-with-timer (company--idle-delay) nil
- 'company-idle-begin
- (current-buffer) (selected-window)
- (buffer-chars-modified-tick)
(point))))))
+ (let ((delay (company--idle-delay)))
+ (and (numberp delay)
+ (not defining-kbd-macro)
+ (company--should-begin)
+ (setq company-timer
+ (run-with-timer delay nil
+ 'company-idle-begin
+ (current-buffer) (selected-window)
+ (buffer-chars-modified-tick)
(point)))))))
(error (message "Company: An error occurred in post-command")
(message "%s" (error-message-string err))
(company-cancel))))
(company-install-map))
(defun company--idle-delay ()
- (if (memql company-idle-delay '(t 0 0.0))
- 0.01
- company-idle-delay))
+ (let ((delay
+ (if (functionp company-idle-delay)
+ (funcall company-idle-delay)
+ company-idle-delay)))
+ (if (memql delay '(t 0 0.0))
+ 0.01
+ delay)))
(defvar company--begin-inhibit-commands '(company-abort
company-complete-mouse
- [elpa] master b696b39 10/31: Don't run company-completed-started-hook unnecessarily, (continued)
- [elpa] master b696b39 10/31: Don't run company-completed-started-hook unnecessarily, Dmitry Gutov, 2019/04/14
- [elpa] master a7c689a 14/31: Merge pull request #859 from yqrashawn/customizable-numbers, Dmitry Gutov, 2019/04/14
- [elpa] master 66ed6df 13/31: make numbers after candidates customizable, Dmitry Gutov, 2019/04/14
- [elpa] master 2b671ec 15/31: Move inhibit-redisplay higher, Dmitry Gutov, 2019/04/14
- [elpa] master 5bd5745 24/31: Merge pull request #883 from nikital/tng-document-no-post-completion, Dmitry Gutov, 2019/04/14
- [elpa] master 03fa690 27/31: Merge pull request #886 from cburn11/update-company-clang--completetion-pattern, Dmitry Gutov, 2019/04/14
- [elpa] master 23136d3 28/31: Update copyright years, Dmitry Gutov, 2019/04/14
- [elpa] master 87509b1 19/31: company-complete: Don't change last-command if completion exited, Dmitry Gutov, 2019/04/14
- [elpa] master edbb3c5 16/31: Merge branch 'master' of github.com:company-mode/company-mode, Dmitry Gutov, 2019/04/14
- [elpa] master ebc4fce 17/31: Make company-idle-delay support predicate function, Dmitry Gutov, 2019/04/14
- [elpa] master 20fe015 18/31: Merge pull request #874 from amosbird/master,
Dmitry Gutov <=
- [elpa] master f965786 20/31: company-complete: Ensure last command was really the same, Dmitry Gutov, 2019/04/14
- [elpa] master 1974d83 21/31: Make tests resilient to arbitrary text properties in completions, Dmitry Gutov, 2019/04/14
- [elpa] master 2482223 23/31: company-tng: Document post-completion and yasnippet issues, Dmitry Gutov, 2019/04/14
- [elpa] master 668e4b0 22/31: Merge pull request #880 from joaotavora/fix-tests-with-arbitrary-completion-properties, Dmitry Gutov, 2019/04/14
- [elpa] master 5dab70d 26/31: update regex template to match (InBase) declarations, Dmitry Gutov, 2019/04/14
- [elpa] master 5569424 25/31: Revert "company-clang: Skip over identity preprocessor #defines", Dmitry Gutov, 2019/04/14
- [elpa] master d200fed 29/31: Update NEWS for the latest change, Dmitry Gutov, 2019/04/14
- [elpa] master 3eda0ba 30/31: Release 0.9.10, Dmitry Gutov, 2019/04/14
- [elpa] master 5deda28 31/31: Merge commit '3eda0ba23921d43b733f7975e56d490a34b9f30b' from company, Dmitry Gutov, 2019/04/14