Merge changes on t-gnus-6_15-quimby branch.

diff --git a/ChangeLog b/ChangeLog
index 683591a..a0866e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-08  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
+
+       * texi/gnus-ja.texi (Web Newspaper): Update the document of
+       mime-w3m.el.
+
 2002-01-08  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * lisp/gnus-art.el (article-toggle-headers): Expose headers even

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 9258aa6..13c1de3 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -13518,18 +13518,7 @@ an_egroup RET egroups RET www.egroups.comRET your@@email.address RET}\e$B!#\e(B
 @file{~/.gnus} \e$B%U%!%$%k$K0J2<$N@_Dj$r$7$F2<$5$$!#\e(B
 
 @lisp
-(setq mime-setup-enable-inline-html nil)
-(eval-after-load "mime-view"
-  '(progn
-     (autoload 'mime-w3m-preview-text/html "mime-w3m")
-     (ctree-set-calist-strictly
-      'mime-preview-condition
-      '((type . text)
-        (subtype . html)
-        (body . visible)
-        (body-presentation-method . mime-w3m-preview-text/html)))
-     (set-alist 'mime-view-type-subtype-score-alist
-                '(text . html) 3)))
+(require 'mime-w3m)
 @end lisp
 
 Web Newspaper \e$B$K4X$9$k0J2<$N\e(B @code{nnshimbun} \e$BJQ?t$rJQ$($k$3$H$,2DG=$G$9\e(B: