mirror of https://github.com/djcb/mu.git
Merge pull request #2591 from Chris00/master
Fix mu4e-compose-mail and some warnings
This commit is contained in:
commit
4845872118
|
@ -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
|
;; this case, but let's prepare for the re-edit case as well
|
||||||
(mu4e--compose-setup
|
(mu4e--compose-setup
|
||||||
'new
|
'new
|
||||||
(lambda (_parent)
|
(lambda (_parent _orig)
|
||||||
(message-mail to subject other-headers continue nil
|
(message-mail to subject other-headers continue nil
|
||||||
yank-action send-actions return-action))
|
yank-action send-actions return-action))
|
||||||
switch-function))
|
switch-function))
|
||||||
|
|
|
@ -160,7 +160,7 @@ the file."
|
||||||
(file-directory-p f))
|
(file-directory-p f))
|
||||||
nil
|
nil
|
||||||
(expand-file-name f)))
|
(expand-file-name f)))
|
||||||
(eshell-flatten-list (reverse args))))))
|
(mu4e--flatten-list (reverse args))))))
|
||||||
;; warn if user tries to attach without any files marked
|
;; warn if user tries to attach without any files marked
|
||||||
(if (null files-to-attach)
|
(if (null files-to-attach)
|
||||||
(error "No files to attach")
|
(error "No files to attach")
|
||||||
|
@ -189,7 +189,7 @@ the file."
|
||||||
(goto-char (point-max)) ; attach at end of buffer
|
(goto-char (point-max)) ; attach at end of buffer
|
||||||
(while files-to-attach
|
(while files-to-attach
|
||||||
(mml-attach-file (car 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))
|
(car files-to-attach))
|
||||||
"application/octet-stream") nil)
|
"application/octet-stream") nil)
|
||||||
(setq files-to-attach (cdr files-to-attach)))
|
(setq files-to-attach (cdr files-to-attach)))
|
||||||
|
|
Loading…
Reference in New Issue