summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2017-03-18 23:03:15 +0100
committerKyle Meyer <kyle@kyleam.com>2017-04-09 20:48:07 -0400
commitdd40193bfaf2f2fa7cf6e6f333d98b431fd15b95 (patch)
tree06356f4a44a076d7e8bc17ad3715c1882c6ae468
parent08674eae5456cc0a8bc4081c5d251e311ed6accf (diff)
downloadorg-mode-dd40193bfaf2f2fa7cf6e6f333d98b431fd15b95.tar.gz
Backport commit c92bae9a0 from Emacs
* lisp/org-list.el (org-list-insert-radio-list): * lisp/org-table.el (orgtbl-setup, orgtbl-insert-radio-table): Use derived-mode-p. change org to use derived-mode-p c92bae9a08cc7c2eb61bad32d9a9d6553b6d2c19 Tom Tromey Wed Apr 5 15:53:38 2017 -0600
-rw-r--r--lisp/org-list.el2
-rw-r--r--lisp/org-table.el4
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org-list.el b/lisp/org-list.el
index df4cb1c..b49bff8 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -3199,7 +3199,7 @@ Point is left at list's 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-table.el b/lisp/org-table.el
index 317e734..84e2b4d 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -4474,7 +4474,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 ="]
@@ -4723,7 +4723,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))