[Emacs-diffs] Changes to emacs/lisp/gnus/mm-decode.el

[Miles Bader]

Index: emacs/lisp/gnus/mm-decode.el
diff -u emacs/lisp/gnus/mm-decode.el:1.29 emacs/lisp/gnus/mm-decode.el:1.30
--- emacs/lisp/gnus/mm-decode.el:1.29   Fri Dec  9 08:57:57 2005
+++ emacs/lisp/gnus/mm-decode.el        Sat Dec 17 21:41:33 2005
@@ -283,7 +283,7 @@
   "List of media types that are to be displayed inline.
 See also `mm-inline-media-tests', which says how to display a media
 type inline."
-  :type '(repeat string)
+  :type '(repeat regexp)
   :group 'mime-display)
 
 (defcustom mm-keep-viewer-alive-types
@@ -292,7 +292,7 @@
   "List of media types for which the external viewer will not be killed
 when selecting a different article."
   :version "22.1"
-  :type '(repeat string)
+  :type '(repeat regexp)
   :group 'mime-display)
 
 (defcustom mm-automatic-display
@@ -304,7 +304,7 @@
     "application/pkcs7-signature" "application/x-pkcs7-mime"
     "application/pkcs7-mime")
   "A list of MIME types to be displayed automatically."
-  :type '(repeat string)
+  :type '(repeat regexp)
   :group 'mime-display)
 
 (defcustom mm-attachment-override-types '("text/x-vcard"
@@ -313,17 +313,17 @@
                                          "application/pkcs7-signature"
                                          "application/x-pkcs7-signature")
   "Types to have \"attachment\" ignored if they can be displayed inline."
-  :type '(repeat string)
+  :type '(repeat regexp)
   :group 'mime-display)
 
 (defcustom mm-inline-override-types nil
   "Types to be treated as attachments even if they can be displayed inline."
-  :type '(repeat string)
+  :type '(repeat regexp)
   :group 'mime-display)
 
 (defcustom mm-automatic-external-display nil
   "List of MIME type regexps that will be displayed externally automatically."
-  :type '(repeat string)
+  :type '(repeat regexp)
   :group 'mime-display)
 
 (defcustom mm-discouraged-alternatives nil
@@ -338,7 +338,9 @@
  (\"text/html\" \"text/richtext\")
 
 Adding \"image/.*\" might also be useful.  Spammers use it as the
-prefered part of multipart/alternative messages."
+prefered part of multipart/alternative messages.  See also
+`gnus-buttonized-mime-types', to which adding \"multipart/alternative\"
+enables you to choose manually one of two types those mails include."
   :type '(repeat regexp) ;; See `mm-preferred-alternative-precedence'.
   :group 'mime-display)
 
@@ -769,7 +771,7 @@
                   ;; Use nametemplate (defined in RFC1524) if it is
                   ;; specified in mailcap.
                   (if (assoc "nametemplate" mime-info)
-                      (format (assoc "nametemplate" mime-info) file)
+                      (format (cdr (assoc "nametemplate" mime-info)) file)
                     ;; Add a suffix according to `mailcap-mime-extensions'.
                     (concat file (car (rassoc (mm-handle-media-type handle)
                                               mailcap-mime-extensions))))))