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

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 174-181)

   - Update from CVS
   - Update from CVS: texi/gnus.texi (RSS): Addition.

2006-01-10  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/nnrss.el (nnrss-wash-html-in-text-plain-parts): New variable.
   (nnrss-request-article): Render text/plain parts as HTML.

   * lisp/gnus/gnus-art.el (gnus-article-wash-html-with-w3m): No need to narrow
   the buffer.

2006-01-08  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-cus.el (gnus-group-parameters): Sync posting-style with
   custom definition of `gnus-posting-styles'.

   * lisp/gnus/gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bind
   print-circle.  Suggested by Kalle Olavi Niemitalo <kon@iki.fi>.

2006-01-05  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-group.el (gnus-useful-groups): Use Gmane for ding. Use
   nntp for bug archive.

2006-01-05  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/nnrss.el (nnrss-request-article): Fix the way to fill text/plain
   parts.
   (nnrss-normalize-date): New function converts ISO 8601 date into
   RFC822 style.  Suggested by Mark Plaksin <happy@mcplaksin.org>.
   (nnrss-check-group): Use it.

2006-01-03  Rodrigo Ventura <yoda@isr.ist.utl.pt>  (tiny change)

   * lisp/gnus/gnus-xmas.el (gnus-xmas-group-startup-message): Typo
   gnus-splash-face -> gnus-splash.  Fixes starting from a TTY in
   XEmacs.

2006-01-01  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-sum.el (gnus-summary-work-articles): Remove useless `min'.

   * lisp/gnus/nnrss.el (nnrss-fetch): Make it fail gracefully when it can't
   fetch a feed.  Suggested by Mark Plaksin <happy@mcplaksin.org>.
   (nnrss-insert-w3): Ditto.

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

   * lisp/gnus/nnrss.el (nnrss-request-article): Fix last change; fill
   text/plain parts.

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

   * lisp/gnus/nnrss.el (nnrss-request-article): Replace <br />s with newlines
   in text/plain part.
   (nnrss-check-group): Don't add excessive newline to dc:subject.

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

   * lisp/gnus/gnus-art.el (gnus-article-delete-text-of-type): Enable it to
   remove MIME buttons associated with multipart/alternative parts.
   (gnus-mime-display-alternative): Tag buttons using `article-type'
   text property.

   * lisp/gnus/gnus-msg.el (gnus-copy-article-buffer): Remove MIME buttons
   associated with multipart/alternative parts.

2005-12-19  Mark Plaksin <happy@mcplaksin.org>  (tiny change)

   * lisp/gnus/nnrss.el (nnrss-check-group): Put the RSS dc:subject in the
   article.

2005-12-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>

   * lisp/gnus/dns.el (query-dns): Make sure we check the buffer size before
   removing tcp headers.

2006-01-10  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (RSS): Document nnrss-wash-html-in-text-plain-parts.

2006-01-06  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (RSS): Addition.

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

   * man/gnus.texi (Summary Post Commands): Fix function bound to `S O p'.

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

   * man/emacs-mime.texi (Display Customization): Add setting example to
   mm-discouraged-alternatives.

3 files changed, 76 insertions, 2 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 36085b48d7b..16e9373c5b3 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,20 @@
+2006-01-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (RSS): Document nnrss-wash-html-in-text-plain-parts.
+
+2006-01-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (RSS): Addition.
+
+2005-12-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (Summary Post Commands): Fix function bound to `S O p'.
+
+2005-12-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * emacs-mime.texi (Display Customization): Add setting example to
+        mm-discouraged-alternatives.
+
 2006-01-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * flymake.texi (Obtaining Flymake): Remove chapter since Emacs's
diff --git a/man/emacs-mime.texi b/man/emacs-mime.texi
index d98fd4091bb..9df33969bec 100644
--- a/man/emacs-mime.texi
+++ b/man/emacs-mime.texi
@@ -323,10 +323,28 @@ you could say something like:
 @end lisp
 
 Adding @code{"image/.*"} might also be useful.  Spammers use it as the
-prefered part of @samp{multipart/alternative} messages.  See also
+prefered part of @samp{multipart/alternative} messages, and you might
+not notice there are other parts.  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.
+For example, you can set those variables like:
+
+@lisp
+(setq gnus-buttonized-mime-types
+      '("multipart/alternative" "multipart/signed")
+      mm-discouraged-alternatives
+      '("text/html" "image/.*"))
+@end lisp
+
+In this case, Gnus will display radio buttons for such a kind of spam
+message as follows:
+
+@example
+1.  (*) multipart/alternative  ( ) image/gif
+
+2.  (*) text/plain          ( ) text/html
+@end example
 
 @item mm-inline-large-images
 @vindex mm-inline-large-images
diff --git a/man/gnus.texi b/man/gnus.texi
index ad4343de5d3..df3b1db7874 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -5491,7 +5491,7 @@ default, the message is decoded and forwarded as an rfc822 @acronym{MIME} sectio
 @cindex digests
 @cindex making digests
 Digest the current series and forward the result to a newsgroup
-(@code{gnus-uu-digest-mail-forward}).  This command uses the
+(@code{gnus-uu-digest-post-forward}).  This command uses the
 process/prefix convention.
 
 @item S u
@@ -15886,6 +15886,10 @@ the value of @code{default-file-name-coding-system}.  If you are using
 XEmacs and want to use non-@acronym{ASCII} group names, you should set
 the value for the @code{nnmail-pathname-coding-system} variable properly.
 
+The @code{nnrss} back end generates @samp{multipart/alternative}
+@acronym{MIME} articles in which each contains a @samp{text/plain} part
+and a @samp{text/html} part.
+
 @cindex OPML
 You can also use the following commands to import and export your
 subscriptions from a file in @acronym{OPML} format (Outline Processor
@@ -15923,6 +15927,15 @@ If you set @code{nnrss-use-local} to @code{t}, @code{nnrss} will read
 the feeds from local files in @code{nnrss-directory}.  You can use
 the command @code{nnrss-generate-download-script} to generate a
 download script using @command{wget}.
+
+@item nnrss-wash-html-in-text-plain-parts
+Non-@code{nil} means that @code{nnrss} renders text in @samp{text/plain}
+parts as @acronym{HTML}.  The function specified by the
+@code{mm-text-html-renderer} variable (@pxref{Display Customization,
+,Display Customization, emacs-mime, The Emacs MIME Manual}) will be used
+to render text.  If it is @code{nil}, which is the default, text will
+simply be folded.  Leave it @code{nil} if you prefer to see
+@samp{text/html} parts.
 @end table
 
 The following code may be helpful, if you want to show the description in
@@ -15940,6 +15953,7 @@ the summary buffer.
 
 The following code may be useful to open an nnrss url directly from the
 summary buffer.
+
 @lisp
 (require 'browse-url)
 
@@ -15962,6 +15976,31 @@ summary buffer.
 (add-to-list 'nnmail-extra-headers nnrss-url-field)
 @end lisp
 
+Even if you have added @code{"text/html"} to the
+@code{mm-discouraged-alternatives} variable (@pxref{Display
+Customization, ,Display Customization, emacs-mime, The Emacs MIME
+Manual}) since you don't want to see @acronym{HTML} parts, it might be
+more useful especially in @code{nnrss} groups to display
+@samp{text/html} parts.  Here's an example of setting
+@code{mm-discouraged-alternatives} as a group parameter (@pxref{Group
+Parameters}) in order to display @samp{text/html} parts only in
+@code{nnrss} groups:
+
+@lisp
+;; @r{Set the default value of @code{mm-discouraged-alternatives}.}
+(eval-after-load "gnus-sum"
+  '(add-to-list
+    'gnus-newsgroup-variables
+    '(mm-discouraged-alternatives
+      . '("text/html" "image/.*"))))
+
+;; @r{Display @samp{text/html} parts in @code{nnrss} groups.}
+(add-to-list
+ 'gnus-parameters
+ '("\\`nnrss:" (mm-discouraged-alternatives nil)))
+@end lisp
+
+
 @node Customizing W3
 @subsection Customizing W3
 @cindex W3