Merge branch 'main' into emacs-30

1 files changed, 7 insertions, 12 deletions

diff --git a/compat-tests.el b/compat-tests.el
index 74def73..2e035e3 100644
--- a/compat-tests.el
+++ b/compat-tests.el
@@ -1202,24 +1202,19 @@
     (put three 'derived-mode-parent two)
     (should (provided-mode-derived-p one one))
     (should (provided-mode-derived-p two one))
+    (should (provided-mode-derived-p two two))
     (should (provided-mode-derived-p three one))
     (should-not (provided-mode-derived-p one eins))
     (should-not (provided-mode-derived-p two eins))
     (should-not (provided-mode-derived-p two one.5))
-    (should (provided-mode-derived-p two one.5 one))
-    (should (provided-mode-derived-p two one.5 two))
-    (should (provided-mode-derived-p three one.5 one))
-    (should (provided-mode-derived-p three one.5 one two))
-    (should (provided-mode-derived-p three one.5 two one))
-    (should (provided-mode-derived-p three one.5 two one three))
-    (should (provided-mode-derived-p three one.5 three two one))
+    (should (provided-mode-derived-p three one))
+    (should (provided-mode-derived-p three two))
+    (should-not (provided-mode-derived-p three one.5))
     (let ((major-mode three))
+      (should-not (derived-mode-p one.5))
       (should (derived-mode-p one))
-      (should (derived-mode-p one.5 one))
-      (should (derived-mode-p one.5 one two))
-      (should (derived-mode-p one.5 two one))
-      (should (derived-mode-p one.5 two one three))
-      (should (derived-mode-p one.5 three two one)))))
+      (should (derived-mode-p two))
+      (should (derived-mode-p three)))))
 
 (ert-deftest compat-format-prompt ()
   (should-equal "Prompt: " (format-prompt "Prompt" nil))