1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00

* 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.
This commit is contained in:
Stefan Monnier 2021-01-30 00:40:21 -05:00
parent d6f8bce6d4
commit 9e96fca53d
6 changed files with 19 additions and 16 deletions

View file

@ -1725,14 +1725,14 @@ a type (see `mailcap-mime-types').
Optional argument DEFAULT is returned if a type isn't entered."
(mailcap-parse-mimetypes)
(let* ((default (or default
(mm-default-file-encoding filename)
(mm-default-file-type filename)
"application/octet-stream"))
(probed-type (mh-file-mime-type filename))
(type (or (and (not (equal probed-type "application/octet-stream"))
probed-type)
(completing-read
(format "Content type (default %s): " default)
(mapcar 'list (mailcap-mime-types))))))
(mapcar #'list (mailcap-mime-types))))))
(if (not (equal type ""))
type
default)))