From: Austin Clements <amdragon@MIT.EDU>
Date: Fri, 18 Apr 2014 22:57:17 +0000 (-0400)
Subject: emacs: Honor debug-on-error for part renderers
X-Git-Tag: 0.18_rc0~18
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=1ada97e05b5385ef242b19c0d5903628a97e06fe

emacs: Honor debug-on-error for part renderers

Previously, even if debug-on-error was non-nil, the debugger would not
trap on part renderer errors.  This made debugging part renderer bugs
frustrating, so let the debugger trap these errors.
---

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index f6ca827e..df10d4ba 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -785,7 +785,10 @@ message at DEPTH in the current thread."
     (while (and handlers
 		(not (condition-case err
 			 (funcall (car handlers) msg part content-type nth depth button)
-		       (error (progn
+		       ;; Specifying `debug' here lets the debugger
+		       ;; run if `debug-on-error' is non-nil.
+		       ((debug error)
+			(progn
 				(insert "!!! Bodypart insert error: ")
 				(insert (error-message-string err))
 				(insert " !!!\n") nil)))))