Fixed bug causing company to give up after first back-end.

diff --git a/company.el b/company.el
index f12b38ba2a2d4a0b5b5dfa73b397ef254df802dd..033a880182a60c7c464f9943bac20434d951c922 100644 (file)
--- a/company.el
+++ b/company.el
@@ -540,12 +540,12 @@ keymap during active completions (`company-active-map'):
     (unless company-candidates
       (let (prefix)
         (dolist (backend company-backends)
-          (and (fboundp backend)
-               (setq prefix (funcall backend 'prefix))
-               (company-should-complete prefix)
-               (setq company-backend backend)
-               (company-calculate-candidates prefix))
-          (return prefix)))))
+          (when (and (fboundp backend)
+                     (setq prefix (funcall backend 'prefix)))
+            (setq company-backend backend)
+            (when (company-should-complete prefix)
+              (company-calculate-candidates prefix))
+            (return prefix))))))
   (if company-candidates
       (progn
         (when (and company-end-of-buffer-workaround (eobp))