branch: externals/ivy
commit fa2f99bdc6a95c0cda22ba0ce632812a89ce22f5
Author: Joe Junior <joe.fbs.jun...@gmail.com>
Commit: Oleh Krehel <ohwoeo...@gmail.com>
Fix for issue #2805 by using company-finish on counsel-company.
---
counsel.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/counsel.el b/counsel.el
index aa439e70a8..a486fe1522 100644
--- a/counsel.el
+++ b/counsel.el
@@ -382,12 +382,12 @@ Update the minibuffer with the amount of lines collected
every
(setq ivy-completion-beg (- (point) len))
(setq ivy-completion-end (point))
(ivy-read "Candidate: " company-candidates
- :action #'ivy-completion-in-region-action
+ :action 'company-finish
:caller 'counsel-company))))
(ivy-configure 'counsel-company
:display-transformer-fn #'counsel--company-display-transformer
- :unwind-fn #'company-abort)
+ :unwind-fn (lambda() (unless ivy-exit (company-abort))))
(defun counsel--company-display-transformer (s)
(concat s (let ((annot (company-call-backend 'annotation s)))
