Backport commit 7705bdfa5b8 from Emacs

magit · Dec 4, 2023 · 2f12f06 · 2f12f06
1 parent dde8e88
commit 2f12f06
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lisp/transient.el b/lisp/transient.el
@@ -2135,10 +2135,12 @@ value.  Otherwise return CHILDREN as is."
    (if-not-mode    (not (if (atom if-not-mode)
                             (eq major-mode if-not-mode)
                           (memq major-mode if-not-mode))))
-   (if-derived          (if (atom if-derived)
+   (if-derived          (if (or (atom if-derived)
+                                (>= emacs-major-version 30))
                             (derived-mode-p if-derived)
                           (apply #'derived-mode-p if-derived)))
-   (if-not-derived (not (if (atom if-not-derived)
+   (if-not-derived (not (if (or (atom if-not-derived)
+                                (>= emacs-major-version 30))
                             (derived-mode-p if-not-derived)
                           (apply #'derived-mode-p if-not-derived))))
    (default)))