Synch to No Gnus 200506091113.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e386a36..d0e188c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-view.el (mm-inline-text): Turn off adaptive-fill-mode while
+       executing enriched-decode.
+
 2005-06-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-util.el (mm-find-buffer-file-coding-system): Don't examine

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index f3e2f79..0d74f22 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -366,7 +366,10 @@
       (when (or (equal type "enriched")
                (equal type "richtext"))
        (ignore-errors
-         (enriched-decode (point-min) (point-max))))
+         ;; 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)))))
       (mm-handle-set-undisplayer
        handle
        `(lambda ()