From a7ad5e02925ca786710fe8dcd07d82015290edc0 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 12 Dec 2005 23:09:36 +0000 Subject: [PATCH] Synch to No Gnus 200512122306. --- lisp/ChangeLog | 19 +++++++++++++++++++ lisp/gnus-art.el | 4 +++- lisp/mm-decode.el | 9 +++++++-- lisp/mm-uu.el | 9 ++++++--- texi/ChangeLog | 10 ++++++++++ texi/emacs-mime.texi | 6 ++++++ texi/gnus.texi | 6 ++++++ 7 files changed, 57 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ea6f589..e20d565 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,22 @@ +2005-12-12 Katsumi Yamaoka + + * 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 + + * mm-decode.el (mm-discouraged-alternatives): Fix custom type. + Suggest image/.* in the doc string. + +2005-12-12 Reiner Steib + + * mm-uu.el (mm-uu-type-alist): Don't depend on message.el for + message-marks (Debian bug #342521). + 2005-12-12 Simon Josefsson * password.el (password-read-from-cache): Add. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 91f3981..23dd7a3 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -874,7 +874,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 03da579..fe5f282 100644 --- 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 diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el index efdcf53..bff144a 100644 --- a/lisp/mm-uu.el +++ b/lisp/mm-uu.el @@ -97,7 +97,7 @@ This can be either \"inline\" or \"attachment\".") :group 'gnus-article-mime) (defvar mm-uu-type-alist - `((postscript + '((postscript "^%!PS-" "^%%EOF$" mm-uu-postscript-extract @@ -165,8 +165,11 @@ This can be either \"inline\" or \"attachment\".") nil mm-uu-diff-test) (message-marks - ,(concat "^" (regexp-quote message-mark-insert-begin)) - ,(concat "^" (regexp-quote message-mark-insert-end)) + ;; Text enclosed with tags similar to `message-mark-insert-begin' and + ;; `message-mark-insert-end'. Don't use those variables to avoid + ;; dependency on `message.el'. + "^-+[8<>]*-\\{9,\\}[a-z ]+-\\{9,\\}[a-z ]+-\\{9,\\}[8<>]*-+$" + "^-+[8<>]*-\\{9,\\}[a-z ]+-\\{9,\\}[a-z ]+-\\{9,\\}[8<>]*-+$" (lambda () (mm-uu-verbatim-marks-extract 0 -1 1 -2)) nil) ;; Omitting [a-z8<] leads to false positives (bogus signature separators diff --git a/texi/ChangeLog b/texi/ChangeLog index 34765e4..1ce5bdf 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,13 @@ +2005-12-12 Katsumi Yamaoka + + * gnus.texi (MIME Commands): Mention addition of + multipart/alternative to gnus-buttonized-mime-types and add xref + to mm-discouraged-alternatives. + + * emacs-mime.texi (Display Customization): Mention addition of + "image/.*" and add xref to gnus-buttonized-mime-types in the + mm-discouraged-alternatives section. + 2005-12-06 Katsumi Yamaoka * gnus-news.el: Markup and description fixes and additions. diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi index 161cb86..d69720c 100644 --- a/texi/emacs-mime.texi +++ b/texi/emacs-mime.texi @@ -341,6 +341,12 @@ you could say something like: (remove "text/html" mm-automatic-display)) @end lisp +Adding @code{"image/.*"} might also be useful. Spammers use it as the +prefered part of multipart/alternative messages. See also +@code{gnus-buttonized-mime-types} (@pxref{MIME Commands, ,MIME Commands, +gnus, Gnus Manual}), to which adding @code{"multipart/alternative"} +enables you to choose manually one of two types those mails include. + @item mm-inline-large-images @vindex mm-inline-large-images When displaying inline images that are larger than the window, Emacs diff --git a/texi/gnus.texi b/texi/gnus.texi index ae39dfb..178254a 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -9451,6 +9451,12 @@ To see e.g. security buttons but no other buttons, you could set this variable to @code{("multipart/signed")} and leave @code{gnus-unbuttonized-mime-types} at the default value. +You could also add @code{"multipart/alternative"} to this list to +display radio buttons that allow you to choose one of two media types +those mails include. See also @code{mm-discouraged-alternatives} +(@pxref{Display Customization, ,Display Customization, emacs-mime, The +Emacs MIME Manual}). + @item gnus-inhibit-mime-unbuttonizing @vindex gnus-inhibit-mime-unbuttonizing If this is non-@code{nil}, then all @acronym{MIME} parts get buttons. The -- 1.7.10.4