branch: externals/compat
commit 3a415950d4e038bd2804b12b2e7e0ad097440b62
Merge: b2357bf0bf ea8de2ea18
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
Merge branch 'main' into emacs-30
---
compat-26.el | 2 +-
compat-tests.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/compat-26.el b/compat-26.el
index 0c22fbf00a..9d3d7b9eac 100644
--- a/compat-26.el
+++ b/compat-26.el
@@ -75,7 +75,7 @@ see `region-noncontiguous-p' and `extract-rectangle-bounds'."
;;;; Defined in subr.el
-(compat-defun provided-mode-derived-p (mode &rest modes) ;;
<compat-tests:provided-derived-mode-p>
+(compat-defun provided-mode-derived-p (mode &rest modes) ;;
<compat-tests:provided-mode-derived-p>
"Non-nil if MODE is derived from one of MODES.
Uses the `derived-mode-parent' property of the symbol to trace backwards.
If you just want to check `major-mode', use `derived-mode-p'."
diff --git a/compat-tests.el b/compat-tests.el
index 2e035e3025..2ebd9bfa97 100644
--- a/compat-tests.el
+++ b/compat-tests.el
@@ -1191,7 +1191,7 @@
(should-equal '((0 . zero) a (0 . zero)) (compat-call assoc-delete-all 0
(list (cons 0 'zero) (cons 1 'one) 'a (cons 0 'zero)) #'/=))
(should-equal '(a (0 . zero) (0 . zero)) (compat-call assoc-delete-all 0
(list 'a (cons 0 'zero) (cons 1 'one) (cons 0 'zero)) #'/=)))
-(ert-deftest compat-provided-derived-mode-p ()
+(ert-deftest compat-provided-mode-derived-p ()
(let ((one (make-symbol "1"))
(two (make-symbol "2"))
(three (make-symbol "3"))
