diff options
| author | Stefan Monnier | 2021-01-30 00:40:21 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2021-01-30 12:29:58 -0500 |
| commit | 9e96fca53dbd9f52b69341dbb5d9849fd2b5a16c (patch) | |
| tree | 64fe3d0bca876bd8cc4710020b64f162d6089592 /lisp/mh-e | |
| parent | d6f8bce6d4595bc1af53772fa0f302e16adcbf23 (diff) | |
| download | emacs-9e96fca53dbd9f52b69341dbb5d9849fd2b5a16c.tar.gz emacs-9e96fca53dbd9f52b69341dbb5d9849fd2b5a16c.zip | |
* lisp/gnus/mm-encode.el (mm-default-file-type): New name
Rename from misleading `mm-default-file-encoding`.
(mm-default-file-encoding): Redefine as obsolete alias.
* lisp/mail/sendmail.el (mail-add-attachment):
* lisp/mh-e/mh-mime.el (mh-minibuffer-read-type):
* lisp/gnus/gnus-art.el (gnus-mime-view-part-as-type-internal):
* lisp/gnus/gnus-dired.el (gnus-dired-attach):
* lisp/gnus/mml.el (mml-generate-mime-1, mml-minibuffer-read-type)
(mml-attach-file): Use the new name.
Diffstat (limited to 'lisp/mh-e')
| -rw-r--r-- | lisp/mh-e/mh-mime.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 7bdf743fc42..70df9e6b0f2 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el | |||
| @@ -1725,14 +1725,14 @@ a type (see `mailcap-mime-types'). | |||
| 1725 | Optional argument DEFAULT is returned if a type isn't entered." | 1725 | Optional argument DEFAULT is returned if a type isn't entered." |
| 1726 | (mailcap-parse-mimetypes) | 1726 | (mailcap-parse-mimetypes) |
| 1727 | (let* ((default (or default | 1727 | (let* ((default (or default |
| 1728 | (mm-default-file-encoding filename) | 1728 | (mm-default-file-type filename) |
| 1729 | "application/octet-stream")) | 1729 | "application/octet-stream")) |
| 1730 | (probed-type (mh-file-mime-type filename)) | 1730 | (probed-type (mh-file-mime-type filename)) |
| 1731 | (type (or (and (not (equal probed-type "application/octet-stream")) | 1731 | (type (or (and (not (equal probed-type "application/octet-stream")) |
| 1732 | probed-type) | 1732 | probed-type) |
| 1733 | (completing-read | 1733 | (completing-read |
| 1734 | (format "Content type (default %s): " default) | 1734 | (format "Content type (default %s): " default) |
| 1735 | (mapcar 'list (mailcap-mime-types)))))) | 1735 | (mapcar #'list (mailcap-mime-types)))))) |
| 1736 | (if (not (equal type "")) | 1736 | (if (not (equal type "")) |
| 1737 | type | 1737 | type |
| 1738 | default))) | 1738 | default))) |