[elpa] externals/company 106c908520 3/3: Adapt to the change of derived-mode-p's cc, part 2

[ELPA Syncer]

branch: externals/company
commit 106c90852089ae9784e420a699dad3664af1d513
Author: Dmitry Gutov <dmitry@gutov.dev>
Commit: Dmitry Gutov <dmitry@gutov.dev>

    Adapt to the change of derived-mode-p's cc, part 2
---
 company-dabbrev-code.el | 2 +-
 company-dabbrev.el      | 2 +-
 company-elisp.el        | 3 ++-
 company-etags.el        | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/company-dabbrev-code.el b/company-dabbrev-code.el
index 7c7d6e15d4..cf435f28b2 100644
--- a/company-dabbrev-code.el
+++ b/company-dabbrev-code.el
@@ -102,7 +102,7 @@ comments or strings."
   (cl-case command
     (interactive (company-begin-backend 'company-dabbrev-code))
     (prefix (and (or (eq t company-dabbrev-code-modes)
-                     (apply #'derived-mode-p company-dabbrev-code-modes))
+                     (cl-some #'derived-mode-p company-dabbrev-code-modes))
                  (or company-dabbrev-code-everywhere
                      (not (company-in-string-or-comment)))
                  (or (company-grab-symbol) 'stop)))
diff --git a/company-dabbrev.el b/company-dabbrev.el
index 63e138601d..147ffca608 100644
--- a/company-dabbrev.el
+++ b/company-dabbrev.el
@@ -156,7 +156,7 @@ This variable affects both `company-dabbrev' and 
`company-dabbrev-code'."
                   (funcall company-dabbrev-ignore-buffers buffer))
           (with-current-buffer buffer
             (when (or (eq other-buffer-modes 'all)
-                      (apply #'derived-mode-p other-buffer-modes))
+                      (cl-some #'derived-mode-p other-buffer-modes))
               (setq symbols
                     (company-dabbrev--search-buffer regexp nil symbols start
                                                     limit ignore-comments)))))
diff --git a/company-elisp.el b/company-elisp.el
index 98d01482c3..2467c9f574 100644
--- a/company-elisp.el
+++ b/company-elisp.el
@@ -198,7 +198,8 @@ first in the candidates list."
   (interactive (list 'interactive))
   (cl-case command
     (interactive (company-begin-backend 'company-elisp))
-    (prefix (and (derived-mode-p 'emacs-lisp-mode 'inferior-emacs-lisp-mode)
+    (prefix (and (or (derived-mode-p 'emacs-lisp-mode)
+                     (derived-mode-p 'inferior-emacs-lisp-mode))
                  (company-elisp--prefix)))
     (candidates (company-elisp-candidates arg))
     (sorted company-elisp-show-locals-first)
diff --git a/company-etags.el b/company-etags.el
index ed68a75c30..a5dd65a6f7 100644
--- a/company-etags.el
+++ b/company-etags.el
@@ -90,9 +90,9 @@ Set it to t or to a list of major modes."
   (interactive (list 'interactive))
   (cl-case command
     (interactive (company-begin-backend 'company-etags))
-    (prefix (and (apply #'derived-mode-p company-etags-modes)
+    (prefix (and (cl-some #'derived-mode-p company-etags-modes)
                  (or (eq t company-etags-everywhere)
-                     (apply #'derived-mode-p company-etags-everywhere)
+                     (cl-some #'derived-mode-p company-etags-everywhere)
                      (not (company-in-string-or-comment)))
                  (company-etags-buffer-table)
                  (or (company-grab-symbol) 'stop)))