diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-02-10 21:56:55 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-02-10 21:56:55 +0100 |
| commit | 2fcb85c3e780f1f2871ce0f300cfaffce9836eb0 (patch) | |
| tree | a8857ccad8bff12080062a3edaad1a55a3eb8171 /lisp/mail/sendmail.el | |
| parent | 1f626e9662d8120acd5a937f847123cc2b8c6e31 (diff) | |
| parent | 6bfdfeed36fab4680c8db90c22da8f6611694186 (diff) | |
| download | emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.tar.gz emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.tar.bz2 emacs-2fcb85c3e780f1f2871ce0f300cfaffce9836eb0.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/mail/sendmail.el')
| -rw-r--r-- | lisp/mail/sendmail.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el index d2601c35e8d..cd071667562 100644 --- a/lisp/mail/sendmail.el +++ b/lisp/mail/sendmail.el @@ -1800,14 +1800,14 @@ If the current line has `mail-yank-prefix', insert it on the new line." (declare-function mml-attach-file "mml" (file &optional type description disposition)) -(declare-function mm-default-file-encoding "mm-encode" (file)) (defun mail-add-attachment (file) "Add FILE as a MIME attachment to the end of the mail message being composed." (interactive "fAttach file: ") (mml-attach-file file - (or (mm-default-file-encoding file) - "application/octet-stream") nil) + (or (mm-default-file-type file) + "application/octet-stream") + nil) (setq mail-encode-mml t)) |