Merge pull request #2262 from progfolio/fix/org-link

mu4e-org-store-link: prevent error when no message at point
This commit is contained in:
Dirk-Jan C. Binnema 2022-05-28 00:23:29 +03:00 committed by GitHub
commit a1461a47f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions

View File

@ -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.