From: yamaoka <yamaoka>
Date: Tue, 14 Jun 2005 01:38:30 +0000 (+0000)
Subject: Synch to No Gnus 200506140137.
X-Git-Tag: t-gnus-6_17_4-quimby-~474
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=437ca5e2b393c1093e7289e59e84f5be92dfa306;p=elisp%2Fgnus.git-

Synch to No Gnus 200506140137.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0e188c..58638a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mm-view.el (mm-inline-text): Withdraw the last change.
+
 2005-06-09  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mm-view.el (mm-inline-text): Turn off adaptive-fill-mode while
diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 0d74f22..f3e2f79 100644
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -366,10 +366,7 @@
       (when (or (equal type "enriched")
 		(equal type "richtext"))
 	(ignore-errors
-	  ;; Turn off `adaptive-fill-mode' that may cause an error
-	  ;; as the case may be.
-	  (let ((adaptive-fill-mode nil))
-	    (enriched-decode (point-min) (point-max)))))
+	  (enriched-decode (point-min) (point-max))))
       (mm-handle-set-undisplayer
        handle
        `(lambda ()