Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions org-msg.el
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -1553,8 +1551,11 @@ 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)
(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
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
Expand Down