emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] 32/35: `company-other-backend': don't use `company-manual-begin'


From: Dmitry Gutov
Subject: [elpa] 32/35: `company-other-backend': don't use `company-manual-begin'
Date: Sat, 19 Apr 2014 10:12:21 +0000

dgutov pushed a commit to branch master
in repository elpa.

commit b8e192f26e834c165856d279473e68b9f179f816
Author: Dmitry Gutov <address@hidden>
Date:   Mon Apr 14 16:12:11 2014 +0400

    `company-other-backend': don't use `company-manual-begin'
    
    Don't stop when the first applicable backend returns no candidates.
    
    #53
    #90
---
 company.el |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/company.el b/company.el
index e2cb843..4440616 100644
--- a/company.el
+++ b/company.el
@@ -1241,17 +1241,17 @@ Keywords and function definition names are ignored."
 (defun company-other-backend (&optional backward)
   (interactive (list current-prefix-arg))
   (company-assert-enabled)
-  (if company-backend
-      (let* ((after (cdr (member company-backend company-backends)))
-             (before (cdr (member company-backend (reverse company-backends))))
-             (next (if backward
-                       (append before (reverse after))
-                     (append after (reverse before)))))
-        (company-cancel)
-        (cl-dolist (backend next)
-          (when (ignore-errors (company-begin-backend backend))
-            (cl-return t))))
-    (company-manual-begin))
+  (let* ((after (if company-backend
+                    (cdr (member company-backend company-backends))
+                  company-backends))
+         (before (cdr (member company-backend (reverse company-backends))))
+         (next (if backward
+                   (append before (reverse after))
+                 (append after (reverse before)))))
+    (company-cancel)
+    (cl-dolist (backend next)
+      (when (ignore-errors (company-begin-backend backend))
+        (cl-return t))))
   (unless company-candidates
     (error "No other back-end")))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]