Merge pull request #2591 from Chris00/master

Fix mu4e-compose-mail and some warnings
This commit is contained in:
Dirk-Jan C. Binnema 2023-11-08 15:33:18 +02:00 committed by GitHub
commit 4845872118
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -844,7 +844,7 @@ they do not conflict with mu4e inner workings."
;; this case, but let's prepare for the re-edit case as well
(mu4e--compose-setup
'new
(lambda (_parent)
(lambda (_parent _orig)
(message-mail to subject other-headers continue nil
yank-action send-actions return-action))
switch-function))

View File

@ -160,7 +160,7 @@ the file."
(file-directory-p f))
nil
(expand-file-name f)))
(eshell-flatten-list (reverse args))))))
(mu4e--flatten-list (reverse args))))))
;; warn if user tries to attach without any files marked
(if (null files-to-attach)
(error "No files to attach")
@ -189,7 +189,7 @@ the file."
(goto-char (point-max)) ; attach at end of buffer
(while files-to-attach
(mml-attach-file (car files-to-attach)
(or (mm-default-file-encoding
(or (mu4e--mm-default-file-type
(car files-to-attach))
"application/octet-stream") nil)
(setq files-to-attach (cdr files-to-attach)))