]> rtime.felk.cvut.cz Git - sojka/company-mode.git/commitdiff
`company-other-backend': don't use `company-manual-begin'
authorDmitry Gutov <dgutov@yandex.ru>
Mon, 14 Apr 2014 12:12:11 +0000 (16:12 +0400)
committerDmitry Gutov <dgutov@yandex.ru>
Mon, 14 Apr 2014 12:12:11 +0000 (16:12 +0400)
Don't stop when the first applicable backend returns no candidates.

#53
#90

company.el

index e2cb843635d8bcf42537869243e2fb5d2f048cc2..444061680323a16d51451ab1d25a6d6addc2b1f3 100644 (file)
@@ -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")))