diff options
| author | Eli Zaretskii | 2022-10-01 18:00:24 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2022-10-01 18:00:24 +0300 |
| commit | ced37a87e73e6450b554d5a5db2b451aec70fafe (patch) | |
| tree | 4baa5368e86d9e5d2c72cbe3c896e45a32216532 | |
| parent | 3bd960692218b3dedc64dac44cc0777b8eb24782 (diff) | |
| parent | 3215760194f9d28f0053c38d9b2eb0942914615c (diff) | |
| download | emacs-ced37a87e73e6450b554d5a5db2b451aec70fafe.tar.gz emacs-ced37a87e73e6450b554d5a5db2b451aec70fafe.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
| -rw-r--r-- | lisp/net/mailcap.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/net/mailcap.el b/lisp/net/mailcap.el index b678df30bd4..aa0c1726553 100644 --- a/lisp/net/mailcap.el +++ b/lisp/net/mailcap.el | |||
| @@ -1066,8 +1066,10 @@ If FORCE, re-parse even if already parsed." | |||
| 1066 | extns nil))))) | 1066 | extns nil))))) |
| 1067 | 1067 | ||
| 1068 | (defun mailcap--regexp-quote-type (type) | 1068 | (defun mailcap--regexp-quote-type (type) |
| 1069 | (pcase-let ((`(,major ,minor) (split-string type "/"))) | 1069 | (if (not (string-search "/" type)) |
| 1070 | (concat major "/" (regexp-quote minor)))) | 1070 | type |
| 1071 | (pcase-let ((`(,major ,minor) (split-string type "/"))) | ||
| 1072 | (concat major "/" (regexp-quote minor))))) | ||
| 1071 | 1073 | ||
| 1072 | (defun mailcap-extension-to-mime (extn) | 1074 | (defun mailcap-extension-to-mime (extn) |
| 1073 | "Return the MIME content type of the file extensions EXTN." | 1075 | "Return the MIME content type of the file extensions EXTN." |