From 8c1466773fe8b6f02cecf2e406e27a203118ecd2 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Wed, 6 Dec 2023 20:30:47 +0200 Subject: [PATCH] mu4e: get rid of mu4e-is-mode-or-derived-p derived-mode-p is enough --- mu4e/mu4e-helpers.el | 4 ---- mu4e/mu4e-org.el | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mu4e/mu4e-helpers.el b/mu4e/mu4e-helpers.el index 28288d90..59f6ab5c 100644 --- a/mu4e/mu4e-helpers.el +++ b/mu4e/mu4e-helpers.el @@ -518,10 +518,6 @@ in an external program." (lambda () (ignore-errors (delete-file tmpfile)))) tmpfile)) -(defsubst mu4e-is-mode-or-derived-p (mode) - "Is the current mode equal to MODE or derived from it?" - (or (eq major-mode mode) (derived-mode-p mode))) - (defun mu4e-display-manual () "Display the mu4e manual page for the current mode. Or go to the top level if there is none." diff --git a/mu4e/mu4e-org.el b/mu4e/mu4e-org.el index 01ddcd3e..f4b0c242 100644 --- a/mu4e/mu4e-org.el +++ b/mu4e/mu4e-org.el @@ -112,8 +112,8 @@ It links to the last known query when in `mu4e-headers-mode' with a specific message, based on its message-id, so that links stay valid even after moving the message around." (cond - ((mu4e-is-mode-or-derived-p 'mu4e-view-mode) (mu4e--org-store-link-message)) - ((mu4e-is-mode-or-derived-p 'mu4e-headers-mode) + ((derived-mode-p 'mu4e-view-mode) (mu4e--org-store-link-message)) + ((derived-mode-p 'mu4e-headers-mode) (if mu4e-org-link-query-in-headers-mode (mu4e--org-store-link-query) (mu4e--org-store-link-message)))))