Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22186a5..114159f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * mm-view.el (mm-text-html-renderer-alist): Add w3m-standalone. 
+       (mm-text-html-washer-alist): Ditto.
+
 2002-10-19  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 
        * nnheader.el (nnheader-remove-body): Fix an error of detecting

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 046142a..82ad9cc 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -41,6 +41,8 @@
 (defvar mm-text-html-renderer-alist
   '((w3  . mm-inline-text-html-render-with-w3)
     (w3m . mm-inline-text-html-render-with-w3m)
+    (w3m-standalone mm-inline-render-with-stdin nil
+                   "w3m" "-dump" "-T" "text/html")
     (links mm-inline-render-with-file
           mm-links-remove-leading-blank
           "links" "-dump" file)
@@ -52,6 +54,8 @@
 (defvar mm-text-html-washer-alist
   '((w3  . gnus-article-wash-html-with-w3)
     (w3m . gnus-article-wash-html-with-w3m)
+    (w3m-standalone mm-inline-render-with-stdin nil
+                   "w3m" "-dump" "-T" "text/html")
     (links mm-inline-wash-with-file
           mm-links-remove-leading-blank
           "links" "-dump" file)

diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 5456fe9..8717e61 100644 (file)
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -345,9 +345,10 @@ variable will cause @samp{text/html} parts to be treated as attachments.
 This selects the function used to render @sc{html}.  The predefined
 renderers are selected by the symbols @code{w3},
 @code{w3m}@footnote{See @uref{http://emacs-w3m.namazu.org/} for more
-information about emacs-w3m}, @code{links}, @code{lynx} or
-@code{html2text}.  You can also specify a function, which will be
-called with a @sc{mime} handle as the argument.
+information about emacs-w3m}, @code{links}, @code{lynx},
+@code{w3m-standalone} or @code{html2text}.  You can also specify a
+function, which will be called with a @sc{mime} handle as the
+argument.
 
 @item mm-inline-text-html-with-images
 Some @sc{html} mails might have the trick of spammers using