summaryrefslogtreecommitdiff
path: root/man/gnus.texi
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2006-01-16 09:27:43 +0000
committerMiles Bader <miles@gnu.org>2006-01-16 09:27:43 +0000
commit73043f7d550e049a636d1058ebd7a5b318533aba (patch)
tree7d3d034bc08fd1c07b0d71fb10bdcffa577104a9 /man/gnus.texi
parentfc77df2c34d088921e1952a8fce5470c5250ad89 (diff)
downloademacs-73043f7d550e049a636d1058ebd7a5b318533aba.tar.gz
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-698
Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 182-184) - Merge from emacs--cvs-trunk--0 - Update from CVS 2006-01-16 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/mm-uu.el (mm-uu-text-plain-type): New variable. (mm-uu-pgp-signed-extract-1): Use it. (mm-uu-pgp-encrypted-extract-1): Use it. (mm-uu-dissect): Use it; allow two optional arguments; one is a flag specifying whether there's no message header; the other is for a MIME type and parameters; bind mm-uu-text-plain-type with the later one. (mm-uu-dissect-text-parts): New function. * lisp/gnus/gnus-art.el (gnus-display-mime): Use mm-uu-dissect-text-parts to dissect text parts. 2006-01-13 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gnus-art.el (article-wash-html): Use gnus-summary-show-article-charset-alist if a numeric arg is given. (gnus-article-wash-html-with-w3m-standalone): New function. * lisp/gnus/mm-view.el (mm-text-html-renderer-alist): Map w3m-standalone to mm-inline-text-html-render-with-w3m-standalone. (mm-text-html-washer-alist): Map w3m-standalone to gnus-article-wash-html-with-w3m-standalone. (mm-inline-text-html-render-with-w3m-standalone): New function. 2006-01-13 Katsumi Yamaoka <yamaoka@jpl.org> * man/gnus.texi (Article Washing): Additions. 2006-01-08 Alex Schroeder <alex@gnu.org> * man/pgg.texi (Caching passphrase): Rewording.
Diffstat (limited to 'man/gnus.texi')
-rw-r--r--man/gnus.texi9
1 files changed, 7 insertions, 2 deletions
diff --git a/man/gnus.texi b/man/gnus.texi
index df3b1db7874..e28537329ba 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -8571,7 +8571,9 @@ Treat @acronym{HTML} (@code{gnus-article-wash-html}). Note that this is
usually done automatically by Gnus if the message in question has a
@code{Content-Type} header that says that the message is @acronym{HTML}.
-If a prefix is given, a charset will be asked for.
+If a prefix is given, a charset will be asked for. If it is a number,
+the charset defined in @code{gnus-summary-show-article-charset-alist}
+(@pxref{Paging the Article}) will be used.
@vindex gnus-article-wash-function
The default is to use the function specified by
@@ -8582,12 +8584,15 @@ Customization, emacs-mime, The Emacs MIME Manual}) to convert the
can use include:
@table @code
-@item W3
+@item w3
Use Emacs/W3.
@item w3m
Use @uref{http://emacs-w3m.namazu.org/, emacs-w3m}.
+@item w3m-standalone
+Use @uref{http://w3m.sourceforge.net/, w3m}.
+
@item links
Use @uref{http://links.sf.net/, Links}.