mml.el (mml-preview): Make sure to bind gnus-displaying-mime to nil, assuming that...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e369ce9c55c5d8a82f2510eec943746370b66c9a..2d821b29b643e20130dce6462ba64cddef1537a7 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,9 @@
 2010-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * mml.el (mml-preview): Make sure to bind gnus-displaying-mime to nil,
+       assuming that article displaying or another mml-preview may be
+       interrupted for an error or for the like.
+
        * shr.el (shr-get-background): Fix argument name.
 
 2010-11-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>

diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 7314675e6f8162baa7d034f68cefbead0da0624b..7dc6b76afae5613257adedf06627f8d70b143686 100644 (file)
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1509,7 +1509,8 @@ or the `pop-to-buffer' function."
              (mm-disable-multibyte)
              (insert s)))
        (let ((gnus-newsgroup-charset (car message-posting-charset))
-             gnus-article-prepare-hook gnus-original-article-buffer)
+             gnus-article-prepare-hook gnus-original-article-buffer
+             gnus-displaying-mime)
          (run-hooks 'gnus-article-decode-hook)
          (let ((gnus-newsgroup-name "dummy")
                (gnus-newsrc-hashtb (or gnus-newsrc-hashtb