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/gnus/mm-encode.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/gnus/mm-encode.el')
| -rw-r--r-- | lisp/gnus/mm-encode.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/gnus/mm-encode.el b/lisp/gnus/mm-encode.el index 8bd3e0b3d2d..84a3b0a8d1c 100644 --- a/lisp/gnus/mm-encode.el +++ b/lisp/gnus/mm-encode.el @@ -1,4 +1,4 @@ -;;; mm-encode.el --- Functions for encoding MIME things +;;; mm-encode.el --- Functions for encoding MIME things -*- lexical-binding: t; -*- ;; Copyright (C) 1998-2021 Free Software Foundation, Inc. @@ -98,9 +98,12 @@ This variable should never be set directly, but bound before a call to boundary)) ;;;###autoload -(defun mm-default-file-encoding (file) - "Return a default encoding for FILE." - (if (not (string-match "\\.[^.]+$" file)) +(define-obsolete-function-alias 'mm-default-file-encoding + #'mm-default-file-type "future") ;Old bad name. +;;;###autoload +(defun mm-default-file-type (file) + "Return a default content type for FILE." + (if (not (string-match "\\.[^.]+\\'" file)) "application/octet-stream" (mailcap-extension-to-mime (match-string 0 file)))) |