changeset 111708:13061011e6ac

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.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Thu, 25 Nov 2010 05:09:25 +0000
parents aa580ff3975a
children 4483c6423ad1
files lisp/gnus/ChangeLog lisp/gnus/mml.el
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Wed Nov 24 23:43:56 2010 -0500
+++ b/lisp/gnus/ChangeLog	Thu Nov 25 05:09:25 2010 +0000
@@ -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>
--- a/lisp/gnus/mml.el	Wed Nov 24 23:43:56 2010 -0500
+++ b/lisp/gnus/mml.el	Thu Nov 25 05:09:25 2010 +0000
@@ -1509,7 +1509,8 @@
 	      (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