Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-676

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 169-173)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

2005-12-16  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (gnus-signature-separator): Fix custom type.

   * lisp/gnus/mm-decode.el (mm-inlined-types): Fix custom type.
   (mm-keep-viewer-alive-types): Ditto.
   (mm-automatic-display): Ditto.
   (mm-attachment-override-types): Ditto.
   (mm-inline-override-types): Ditto.
   (mm-automatic-external-display): Ditto.

2005-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-art.el (gnus-buttonized-mime-types): Mention addition of
   multipart/alternative and add xref to mm-discouraged-alternatives
   in doc string.

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

2005-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/rfc2047.el (rfc2047-charset-to-coding-system): Recognize
   us-ascii as a MIME charset.

   * lisp/gnus/mm-bodies.el (mm-decode-content-transfer-encoding): Protect
   against the case where the 2nd arg TYPE is nil.

2005-12-09  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-start.el (gnus-no-server-1): Mention
   `gnus-level-default-subscribed' in doc string.

2005-11-26  Dave Love  <fx@gnu.org>

   * lisp/gnus/tls.el (open-tls-stream): Rename arg SERVICE to PORT.
   (tls-program, tls-success): Provide openssl alternative.

   * lisp/gnus/starttls.el: Doc fixes.
   (starttls-open-stream-gnutls, starttls-open-stream): Rename arg
   SERVICE to PORT.

2005-12-09  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-start.el (gnus-start-draft-setup): Enforce
   `gnus-draft-mode' for nndraft:drafts at startup.

   * lisp/gnus/gnus.el (gnus-splash): Change custom group.
   (gnus-group-get-parameter, gnus-group-parameter-value): Describe
   allow-list argument.

   * lisp/gnus/gnus-agent.el (gnus-agent-article-alist-save-format): Format doc
   string.

2005-12-09  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>  (tiny change)

   * lisp/gnus/mm-decode.el (mm-display-external): Add lacked cdr.

2005-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (MIME Commands): Mention addition of
   multipart/alternative to gnus-buttonized-mime-types and add xref
   to mm-discouraged-alternatives.

   * man/emacs-mime.texi (Display Customization): Mention addition of
   "image/.*" and add xref to gnus-buttonized-mime-types in the
   mm-discouraged-alternatives section.

1 files changed, 10 insertions, 8 deletions

diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 108c5056541..5b55af4d756 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -283,7 +283,7 @@ before the external MIME handler is invoked."
   "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 @@ type inline."
   "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 @@ when selecting a different article."
     "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 @@ when selecting a different article."
 					  "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 @@ to:
  (\"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 @@ external if displayed external."
 		   ;; 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))))))