branch: externals/corfu
commit aa6d3b0d692cc994500c4151f48256a6c7fe8ea8
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
derived-mode-p: Calling convention changed
---
README.org | 2 +-
corfu.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.org b/README.org
index fcf3b99fdb..189dfca99a 100644
--- a/README.org
+++ b/README.org
@@ -415,7 +415,7 @@ modes.
(defun corfu-insert-shell-filter (&optional _)
"Insert completion candidate and send when inside comint/eshell."
- (when (derived-mode-p 'eshell-mode 'comint-mode)
+ (when (or (derived-mode-p 'eshell-mode) (derived-mode-p 'comint-mode))
(lambda ()
(interactive)
(corfu-insert)
diff --git a/corfu.el b/corfu.el
index aa1aa3cfea..96db5284a1 100644
--- a/corfu.el
+++ b/corfu.el
@@ -1307,7 +1307,7 @@ symbols or elements of the form (not modes). Examples:
('t t)
('nil 0)
((pred symbolp) (and (derived-mode-p p) t))
- (`(not . ,m) (and (apply #'derived-mode-p m)
0)))))))
+ (`(not . ,m) (and (seq-some #'derived-mode-p
m) 0)))))))
(corfu-mode 1)))
;; Emacs 28: Do not show Corfu commands with M-X