branch: externals/org
commit 9b0d7ae0ce47a54fc8299b2d8459909185a0d7cd
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Prefer 'derived-mode-p' to '(eq major-mode ...)'
* lisp/org-attach.el (org-attach-dired-to-subtree):
* lisp/org-list.el (org-list-checkbox-radio-mode):
* lisp/org-table.el (org-table-header-line-mode):
* lisp/org.el (org-unindent-buffer): Use 'derived-mode-p' instead of
directly checking 'major-mode' value.
---
lisp/org-attach.el | 2 +-
lisp/org-list.el | 2 +-
lisp/org-table.el | 2 +-
lisp/org.el | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 8eed590c61..67b430e71a 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -873,7 +873,7 @@ Idea taken from `gnus-dired-attach'."
(get-window-with-predicate
(lambda (window)
(with-current-buffer (window-buffer window)
- (eq major-mode 'org-mode))))))
+ (derived-mode-p 'org-mode))))))
(unless other-win
(user-error
"Can't attach to subtree. No window displaying an Org buffer"))
diff --git a/lisp/org-list.el b/lisp/org-list.el
index 5395140e85..687098c1c1 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -2363,7 +2363,7 @@ is an integer, 0 means `-', 1 means `+' etc. If WHICH is
(define-minor-mode org-list-checkbox-radio-mode
"When turned on, use list checkboxes as radio buttons."
:lighter " CheckBoxRadio"
- (unless (eq major-mode 'org-mode)
+ (unless (derived-mode-p 'org-mode)
(user-error "Cannot turn this mode outside org-mode buffers")))
(defun org-toggle-radio-button (&optional arg)
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 13ce835e22..ebec41f900 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -511,7 +511,7 @@ This may be useful when columns have been shrunk."
(define-minor-mode org-table-header-line-mode
"Display the first row of the table at point in the header line."
:lighter " TblHeader"
- (unless (eq major-mode 'org-mode)
+ (unless (derived-mode-p 'org-mode)
(user-error "Cannot turn org table header mode outside org-mode buffers"))
(if org-table-header-line-mode
(add-hook 'post-command-hook #'org-table-header-set-header nil t)
diff --git a/lisp/org.el b/lisp/org.el
index 3395de04ea..0a4174901e 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -22255,7 +22255,7 @@ Point is moved after both elements."
Relative indentation (between items, inside blocks, etc.) isn't
modified."
(interactive)
- (unless (eq major-mode 'org-mode)
+ (unless (derived-mode-p 'org-mode)
(user-error "Cannot un-indent a buffer not in Org mode"))
(letrec ((parse-tree (org-element-parse-buffer 'greater-element nil 'defer))
(unindent-tree
