From 75144ffdad148902e725a9d04ff1ab346cfb628e Mon Sep 17 00:00:00 2001 From: Justin Silverman Date: Fri, 6 Dec 2024 09:35:25 -0500 Subject: [PATCH 1/3] fixes #200 fixes #200 remove undo from message-sent-hook as it was causing an error and for html drafts to be sent after successful message sending (unintended behavior). Also discussed in #182 where the hook was suspected to be causing problems #182 Note, in #182 multiple users report no issues after removing hook. As requested, only turn remove hook from mu4e --- org-msg.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/org-msg.el b/org-msg.el index 558590c..3686f59 100644 --- a/org-msg.el +++ b/org-msg.el @@ -1503,9 +1503,7 @@ HTML emails." (unless (mu4e-running-p) (org-msg--mu4e-fun-call "start")) (when mu4e-compose-complete-addresses - (org-msg--mu4e-fun-call "compose-setup-completion")) - (when-let ((sent-hook (org-msg--mu4e-fun "compose-before-send"))) - (add-hook 'message-sent-hook sent-hook nil t))) + (org-msg--mu4e-fun-call "compose-setup-completion"))) (defalias 'org-msg-edit-kill-buffer-mu4e 'mu4e-message-kill-buffer) @@ -1553,7 +1551,8 @@ Type \\[org-msg-attach] to call the dispatcher for attachment \\{org-msg-edit-mode-map}" (setq-local message-sent-message-via nil) (add-hook 'message-send-hook 'org-msg-prepare-to-send nil t) - (add-hook 'message-sent-hook 'undo t t) + (if (not (equal mail-user-agent #'mu4e-user-agent)) + (add-hook 'message-sent-hook 'undo t t)) (add-hook 'completion-at-point-functions 'message-completion-function nil t) (cond ((message-mail-alias-type-p 'abbrev) (mail-abbrevs-setup)) ((message-mail-alias-type-p 'ecomplete) (ecomplete-setup))) From a3357d20f7a62452fff86b434d2c8d36be32fea7 Mon Sep 17 00:00:00 2001 From: Spencer Jackson Date: Sun, 12 Jan 2025 17:26:53 -0500 Subject: [PATCH 2/3] Prevent forbidden properties from being set in an org-msg buffer This matches the behavior of message-mode --- org-msg.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org-msg.el b/org-msg.el index 3686f59..e992e73 100644 --- a/org-msg.el +++ b/org-msg.el @@ -1554,6 +1554,8 @@ Type \\[org-msg-attach] to call the dispatcher for attachment (if (not (equal mail-user-agent #'mu4e-user-agent)) (add-hook 'message-sent-hook 'undo t t)) (add-hook 'completion-at-point-functions 'message-completion-function nil t) + (add-hook 'after-change-functions #'message-strip-forbidden-properties + nil 'local) (cond ((message-mail-alias-type-p 'abbrev) (mail-abbrevs-setup)) ((message-mail-alias-type-p 'ecomplete) (ecomplete-setup))) (setq org-font-lock-keywords From ed35b0f5e7577639d5642719bdf52b5fad4cccad Mon Sep 17 00:00:00 2001 From: Sebastien Le Maguer Date: Fri, 30 May 2025 12:23:10 +0300 Subject: [PATCH 3/3] fix no-parent when draft editing When editing a mu4e draft, the message doesn't have parent. This leads to a "mu4e-warn: [mu4e] No message at point" This commit aims to fix this --- org-msg.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org-msg.el b/org-msg.el index e992e73..01f7660 100644 --- a/org-msg.el +++ b/org-msg.el @@ -1120,7 +1120,7 @@ a html mime part, it returns t, nil otherwise." (org-msg-article-htmlp))) (defun org-msg-article-htmlp-mu4e () - (let ((msg mu4e-compose-parent-message)) + (when-let* ((msg mu4e-compose-parent-message)) (with-temp-buffer (insert-file-contents-literally (mu4e-message-readable-path msg) nil nil nil t) @@ -1551,7 +1551,7 @@ Type \\[org-msg-attach] to call the dispatcher for attachment \\{org-msg-edit-mode-map}" (setq-local message-sent-message-via nil) (add-hook 'message-send-hook 'org-msg-prepare-to-send nil t) - (if (not (equal mail-user-agent #'mu4e-user-agent)) + (unless (eq mail-user-agent #'mu4e-user-agent) (add-hook 'message-sent-hook 'undo t t)) (add-hook 'completion-at-point-functions 'message-completion-function nil t) (add-hook 'after-change-functions #'message-strip-forbidden-properties