[elpa] externals/counsel 3b10140790 3/3: Merge branch 'master' into externals/counsel

[Basil L. Contovounesios]

branch: externals/counsel
commit 3b101407905bf7c6d7bb460be4d000f08499651b
Merge: 0e7b3dd8d5 b8be4913a6
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

    Merge branch 'master' into externals/counsel
---
 counsel.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/counsel.el b/counsel.el
index a938330d49..f9db529948 100644
--- a/counsel.el
+++ b/counsel.el
@@ -368,8 +368,8 @@ Update the minibuffer with the amount of lines collected 
every
   (company-mode 1)
   (unless company-candidates
     (company-complete))
-  (company--continue)
   (when company-candidates
+    (company--continue)
     (ivy-read "Candidate: " company-candidates
               :action 'company-finish
               :caller 'counsel-company)))