Synch to Gnus 200312281220.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d4190a..9e3cb92 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2003-12-28  Jesper Harder  <harder@ifa.au.dk>
 
+       * mm-view.el (mm-text-html-washer-alist): Use
+       mm-inline-wash-with-stdin for w3m-standalone.
+
+       * mm-decode.el (mm-text-html-renderer): Add w3m-standalone.
+
        * mml1991.el (mml1991-pgg-encrypt): Decode according to CTE before
        encrypting.
 
@@ -8,7 +13,6 @@
        * mml1991.el (mml1991-pgg-sign): Use unibyte when re-encoding.
        From Ivan Boldyrev <boldyrev@uiggm.nsc.ru> (tiny change).
 
-
 2003-12-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * dgnushack.el: Add an advice to byte-optimize-form-code-walker to

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index d87ec5b..935f0bc 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -100,20 +100,23 @@
 (defcustom mm-text-html-renderer
   (cond ((locate-library "w3") 'w3)
        ((locate-library "w3m") 'w3m)
+       ((executable-find "w3m") 'w3m-standalone)
        ((executable-find "links") 'links)
        ((executable-find "lynx") 'lynx)
        (t 'html2text))
   "Render of HTML contents.
 It is one of defined renderer types, or a rendering function.
 The defined renderer types are:
-`w3'   : using Emacs/W3;
-`w3m'  : using emacs-w3m;
-`links': using links;
-`lynx' : using lynx;
-`html2text' : using html2text;
-nil    : using external viewer."
+`w3'   : use Emacs/W3;
+`w3m'  : use emacs-w3m;
+`w3m-standalone': use w3m;
+`links': use links;
+`lynx' : use lynx;
+`html2text' : use html2text;
+nil    : use external viewer."
   :type '(choice (const w3)
                 (const w3m)
+                (const w3m-standalone)
                 (const links)
                 (const lynx)
                 (const html2text)

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 372c936..27a873f 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -54,7 +54,7 @@
 (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-standalone mm-inline-wash-with-stdin nil
                    "w3m" "-dump" "-T" "text/html")
     (links mm-inline-wash-with-file
           mm-links-remove-leading-blank