From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Sun, 21 Oct 2012 13:35:09 +0000 (+0300)
Subject: emacs/notmuch-show.el: handle bodypart insert error
X-Git-Tag: 0.15_rc1~186
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7c6ac9fbae354cf0f5dd1686476a99f2420bc689;p=notmuch.git

emacs/notmuch-show.el: handle bodypart insert error

When inserting of email bodypart failes, insert a failure message
to the buffer (and continue) instead of halting the insertion of
the rest of that email thread in question.
---

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index f273eb40..d061367e 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -815,7 +815,12 @@ message at DEPTH in the current thread."
     ;; Run the content handlers until one of them returns a non-nil
     ;; value.
     (while (and handlers
-		(not (funcall (car handlers) msg part content-type nth depth declared-type)))
+		(not (condition-case err
+			 (funcall (car handlers) msg part content-type nth depth declared-type)
+		       (error (progn
+				(insert "!!! Bodypart insert error: ")
+				(insert (error-message-string err))
+				(insert " !!!\n") nil)))))
       (setq handlers (cdr handlers))))
   t)