Synch to No Gnus 200509210016.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8581c1..e749d3e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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.
+
 2005-09-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-agent.el (gnus-agent-synchronize-flags): Switch the

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 8bf0c66..2983a1a 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -244,7 +244,9 @@
            (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)
+             w3m-force-redisplay
+             ;; Avoid inserting excessive newlines.
+             w3m-treat-image-size)
          (w3m-region (point-min) (point-max) nil charset))
        (when (and mm-inline-text-html-with-w3m-keymap
                   (boundp 'w3m-minor-mode-map)