Fix the test breakage (probably)

#101

diff --git a/company-dabbrev.el b/company-dabbrev.el
index ee3f65804ac55a3646f24fb25fd8bb1f37435f64..401fcc9181f5391ebcdae07f20b37aedfdc78b0d 100644 (file)
--- a/company-dabbrev.el
+++ b/company-dabbrev.el
@@ -114,7 +114,7 @@ If you set this value to nil, you may also want to set
          (symbols (company-dabbrev--search-buffer regexp (point) nil start limit
                                                   ignore-comments)))
     (when other-buffers
-      (dolist (buffer (delq (current-buffer) (buffer-list)))
+      (cl-dolist (buffer (delq (current-buffer) (buffer-list)))
         (and (or (eq other-buffers 'all)
                  (eq (buffer-local-value 'major-mode buffer) major-mode))
              (with-current-buffer buffer

diff --git a/company-eclim.el b/company-eclim.el
index 24f05f517ffcdb4d72ec5f3e4040d6ed489c1ebf..0eaf38228675de1d41467a7a2e32c986f2197037 100644 (file)
--- a/company-eclim.el
+++ b/company-eclim.el
@@ -40,7 +40,7 @@
 
 (defun company-eclim-executable-find ()
   (let (file)
-    (dolist (eclipse-root '("/Applications/eclipse" "/usr/lib/eclipse"
+    (cl-dolist (eclipse-root '("/Applications/eclipse" "/usr/lib/eclipse"
                             "/usr/local/lib/eclipse"))
       (and (file-exists-p (setq file (expand-file-name "plugins" eclipse-root)))
            (setq file (car (last (directory-files file t "^org.eclim_"))))

diff --git a/company-files.el b/company-files.el
index a450526a0f50d89871c6b44b5e28fd8fc9619654..a839f799ee5cafe6ab3a167f50baeb628d9de174 100644 (file)
--- a/company-files.el
+++ b/company-files.el
@@ -45,7 +45,7 @@
 (defun company-files-grab-existing-name ()
   ;; Grab file names with spaces, only when they include quotes.
   (let (file dir)
-    (and (dolist (regexp company-files-regexps)
+    (and (cl-dolist (regexp company-files-regexps)
            (when (setq file (company-grab-line regexp 1))
              (cl-return file)))
          (setq dir (file-name-directory file))

diff --git a/company.el b/company.el
index 7b185e398620d1ef1fbf14121f0787cd73b791a5..e2cb843635d8bcf42537869243e2fb5d2f048cc2 100644 (file)
--- a/company.el
+++ b/company.el
@@ -291,7 +291,7 @@ This doesn't include the margins and the scroll bar."
 
 (defun company-safe-backends-p (backends)
   (and (consp backends)
-       (not (dolist (backend backends)
+       (not (cl-dolist (backend backends)
               (unless (if (consp backend)
                           (company-safe-backends-p backend)
                         (assq backend company-safe-backends))
@@ -629,7 +629,7 @@ asynchronous call into synchronous.")
    ;; No initialization for lambdas.
    ((functionp backend) t)
    (t ;; Must be a list.
-    (dolist (b backend)
+    (cl-dolist (b backend)
       (unless (keywordp b)
         (company-init-backend b))))))
 
@@ -848,7 +848,7 @@ means that `company-mode' is always turned on except in `message-mode' buffers."
       (`duplicates t)
       ((or `prefix `ignore-case `no-cache `require-match)
        (let (value)
-         (dolist (backend backends)
+         (cl-dolist (backend backends)
            (when (setq value (company--force-sync
                               backend (cons command args) backend))
              (cl-return value)))))
@@ -1081,7 +1081,7 @@ can retrieve meta-data for them."
           (let ((len (length prefix))
                 (completion-ignore-case ignore-case)
                 prev)
-            (dotimes (i (1+ len))
+            (cl-dotimes (i (1+ len))
               (when (setq prev (cdr (assoc (substring prefix 0 (- len i))
                                            company-candidates-cache)))
                 (setq candidates (all-completions prefix prev))
@@ -1248,7 +1248,7 @@ Keywords and function definition names are ignored."
                        (append before (reverse after))
                      (append after (reverse before)))))
         (company-cancel)
-        (dolist (backend next)
+        (cl-dolist (backend next)
           (when (ignore-errors (company-begin-backend backend))
             (cl-return t))))
     (company-manual-begin))
@@ -1340,10 +1340,10 @@ Keywords and function definition names are ignored."
 
 (defun company--begin-new ()
   (let (prefix c)
-    (dolist (backend (if company-backend
-                         ;; prefer manual override
-                         (list company-backend)
-                       company-backends))
+    (cl-dolist (backend (if company-backend
+                            ;; prefer manual override
+                            (list company-backend)
+                          company-backends))
       (setq prefix
             (if (or (symbolp backend)
                     (functionp backend))
@@ -1496,7 +1496,7 @@ Keywords and function definition names are ignored."
 (defun company-search (text lines)
   (let ((quoted (regexp-quote text))
         (i 0))
-    (dolist (line lines)
+    (cl-dolist (line lines)
       (when (string-match quoted line (length company-prefix))
         (cl-return i))
       (cl-incf i))))