From f82d5e62b7a2e7d835eebdee36202c33e97f9b1d Mon Sep 17 00:00:00 2001 From: Nicholas Vollmer Date: Fri, 20 May 2022 14:38:07 -0400 Subject: [PATCH] mu4e-org-store-link: prevent error when no message at point The error can cause org-store-link to short circuit before it should. --- mu4e/mu4e-org.el | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/mu4e/mu4e-org.el b/mu4e/mu4e-org.el index 3232c3ba..a3319661 100644 --- a/mu4e/mu4e-org.el +++ b/mu4e/mu4e-org.el @@ -104,15 +104,12 @@ It links to the last known query when in `mu4e-headers-mode' with `mu4e-org-link-query-in-headers-mode' set; otherwise it links to a specific message, based on its message-id, so that links stay valid even after moving the message around." - (let ((view-mode-p (mu4e-is-mode-or-derived-p 'mu4e-view-mode)) - (headers-mode-p (mu4e-is-mode-or-derived-p 'mu4e-headers-mode)) - (message-p (mu4e-message-at-point))) - (if view-mode-p - (mu4e--org-store-link-message) - (if headers-mode-p - (if (or (not message-p) mu4e-org-link-query-in-headers-mode) - (mu4e--org-store-link-query) - (mu4e--org-store-link-message)))))) + (cond + ((mu4e-is-mode-or-derived-p 'mu4e-view-mode) (mu4e--org-store-link-message)) + ((mu4e-is-mode-or-derived-p 'mu4e-headers-mode) + (if mu4e-org-link-query-in-headers-mode + (mu4e--org-store-link-query) + (mu4e--org-store-link-message))))) (defun mu4e-org-open (link) "Open the org LINK.