change org to use derived-mode-p

* lisp/org/org-list.el (org-list-insert-radio-list): Use
derived-mode-p.
* lisp/org/org-table.el (orgtbl-setup, orgtbl-toggle-comment): Use
derived-mode-p.

diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 4a45fd9817ada809accb64444754da751b372e97..a24c496d7261b40fc882ebb7392f82ae3b8daab9 100644 (file)
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -3035,7 +3035,7 @@ Point is left at list end."
 (defun org-list-insert-radio-list ()
   "Insert a radio list template appropriate for this major mode."
   (interactive)
-  (let* ((e (assq major-mode org-list-radio-list-templates))
+  (let* ((e (cl-assoc-if #'derived-mode-p org-list-radio-list-templates))
         (txt (nth 1 e))
         name pos)
     (unless e (error "No radio list setup defined for %s" major-mode))

diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 08bbf3277baa4fd1841656355a66867ce8b60cec..0c813d03a171fa106971b8dab19e1cc252802132 100644 (file)
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -4269,7 +4269,7 @@ to execute outside of tables."
        "--"
        ("Radio tables"
         ["Insert table template" orgtbl-insert-radio-table
-         (assq major-mode orgtbl-radio-table-templates)]
+         (cl-assoc-if #'derived-mode-p orgtbl-radio-table-templates)]
         ["Comment/uncomment table" orgtbl-toggle-comment t])
        "--"
        ["Set Column Formula" org-table-eval-formula :active (org-at-table-p) :keys "C-c ="]
@@ -4549,7 +4549,7 @@ First element has index 0, or I0 if given."
 (defun orgtbl-insert-radio-table ()
   "Insert a radio table template appropriate for this major mode."
   (interactive)
-  (let* ((e (assq major-mode orgtbl-radio-table-templates))
+  (let* ((e (cl-assoc-if #'derived-mode-p orgtbl-radio-table-templates))
         (txt (nth 1 e))
         name pos)
     (unless e (user-error "No radio table setup defined for %s" major-mode))