Merge pull request #2698 from josephmturner/fix-mu4e--fcc-path

Fix: Put sent mail in correct location when `mu4e-sent-messages-behavior` is a function
This commit is contained in:
Dirk-Jan C. Binnema
2024-04-25 09:19:32 +03:00
committed by GitHub

View File

@ -329,13 +329,19 @@ base filename without any Maildir decoration.
Returns the path for the sent message, either in the sent or Returns the path for the sent message, either in the sent or
trash folder, or nil if the message should be removed after trash folder, or nil if the message should be removed after
sending." sending."
(when-let ((sent-dir (when-let ((sent-behavior
(pcase mu4e-sent-messages-behavior ;; We can't call `functionp' since at least 'delete is a function.
('delete nil) (pcase mu4e-sent-messages-behavior
('trash (mu4e-get-trash-folder parent)) ((or 'delete 'trash 'sent) mu4e-sent-messages-behavior)
('sent (mu4e-get-sent-folder parent)) ((pred functionp mu4e-sent-messages-behavior)
((pred functionp) (funcall mu4e-sent-messages-behavior)) (funcall mu4e-sent-messages-behavior))
(_ (mu4e-error "Error in `mu4e-sent-messages-behavior'"))))) (_ mu4e-sent-messages-behavior)))
(sent-dir
(pcase sent-behavior
('delete nil)
('trash (mu4e-get-trash-folder parent))
('sent (mu4e-get-sent-folder parent))
(_ (mu4e-error "Error in `mu4e-sent-messages-behavior'")))))
(mu4e-join-paths (mu4e-join-paths
(mu4e-root-maildir) sent-dir "cur" (mu4e-root-maildir) sent-dir "cur"
(format "%s%s2,S" base-name mu4e-maildir-info-delimiter)))) (format "%s%s2,S" base-name mu4e-maildir-info-delimiter))))