master ced37a87e7 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

branch: master
commit ced37a87e73e6450b554d5a5db2b451aec70fafe
Merge: 3bd9606922 3215760194
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 lisp/net/mailcap.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/net/mailcap.el b/lisp/net/mailcap.el
index b678df30bd..aa0c172655 100644
--- a/lisp/net/mailcap.el
+++ b/lisp/net/mailcap.el
@@ -1066,8 +1066,10 @@ If FORCE, re-parse even if already parsed."
               extns nil)))))
 
 (defun mailcap--regexp-quote-type (type)
-  (pcase-let ((`(,major ,minor) (split-string type "/")))
-    (concat major "/" (regexp-quote minor))))
+  (if (not (string-search "/" type))
+      type
+    (pcase-let ((`(,major ,minor) (split-string type "/")))
+      (concat major "/" (regexp-quote minor)))))
 
 (defun mailcap-extension-to-mime (extn)
   "Return the MIME content type of the file extensions EXTN."