* gnus-art.el (gnus-buttonized-mime-types): Mention addition of

 multipart/alternative and add xref to mm-discouraged-alternatives in doc
 string.

* mm-decode.el (mm-discouraged-alternatives): Add xref to
 gnus-buttonized-mime-types in doc string.

* mm-decode.el (mm-discouraged-alternatives): Fix custom type.
 Suggest image/.* in the doc string.  By Reiner Steib.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9288e69..c2cca40 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2005-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-art.el (gnus-buttonized-mime-types): Mention addition of
+       multipart/alternative and add xref to mm-discouraged-alternatives
+       in doc string.
+
+       * mm-decode.el (mm-discouraged-alternatives): Add xref to
+       gnus-buttonized-mime-types in doc string.
+
+2005-12-08  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * mm-decode.el (mm-discouraged-alternatives): Fix custom type.
+       Suggest image/.* in the doc string.
+
 2005-12-12  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * mm-uu.el (mm-uu-type-alist): Don't depend on message.el for

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index dc07ddc..336cd79 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -836,7 +836,9 @@ This variable is only used when `gnus-inhibit-mime-unbuttonizing' is nil."
   "List of MIME types that should be given buttons when rendered inline.
 If set, this variable overrides `gnus-unbuttonized-mime-types'.
 To see e.g. security buttons you could set this to
-`(\"multipart/signed\")'.
+`(\"multipart/signed\")'.  You could also add \"multipart/alternative\" to
+this list to display radio buttons that allow you to choose one of two
+media types those mails include.  See also `mm-discouraged-alternatives'.
 This variable is only used when `gnus-inhibit-mime-unbuttonizing' is nil."
   :version "22.1"
   :group 'gnus-article-mime

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 23f4279..439dc75 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -335,8 +335,13 @@ for instance, text/html parts are very unwanted, and text/richtext are
 somewhat unwanted, then the value of this variable should be set
 to:
 
- (\"text/html\" \"text/richtext\")"
-  :type '(repeat string)
+ (\"text/html\" \"text/richtext\")
+
+Adding \"image/.*\" might also be useful.  Spammers use it as the
+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)
 
 (defcustom mm-tmp-directory