From: yamaoka <yamaoka>
Date: Wed, 21 Sep 2005 01:05:31 +0000 (+0000)
Subject: Synch to No Gnus 200509210105.
X-Git-Tag: t-gnus-6_17_4-quimby-~355
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=27bcea6f9829a8e94a0b2ae1d68461003f8bb451;p=elisp%2Fgnus.git-

Synch to No Gnus 200509210105.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e749d3e..888e2fd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2005-09-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+	* mm-view.el (mm-inline-text-html-render-with-w3m): Revert.
+
+2005-09-21  Katsumi Yamaoka  <yamaoka@jpl.org>
+
 	* mm-view.el (mm-inline-text-html-render-with-w3m): Bind
 	w3m-treat-image-size to avoid inserting excessive newlines.
 
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 2983a1a..8bf0c66 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -244,9 +244,7 @@
 	    (delete-region (point-min) (point-max))
 	    (insert (mm-decode-string text charset))))
 	(let ((w3m-safe-url-regexp mm-w3m-safe-url-regexp)
-	      w3m-force-redisplay
-	      ;; Avoid inserting excessive newlines.
-	      w3m-treat-image-size)
+	      w3m-force-redisplay)
 	  (w3m-region (point-min) (point-max) nil charset))
 	(when (and mm-inline-text-html-with-w3m-keymap
 		   (boundp 'w3m-minor-mode-map)