From 7b84236bdbefd440443f58d42b82934f972ced09 Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Fri, 5 Feb 2016 08:03:29 +0200
Subject: [PATCH] mu4e: be tolerant of errors in `mu4e~headers-remove-handler'

Works around issue #789
---
 mu4e/mu4e-headers.el | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mu4e/mu4e-headers.el b/mu4e/mu4e-headers.el
index acc4cc42..646fbe4b 100644
--- a/mu4e/mu4e-headers.el
+++ b/mu4e/mu4e-headers.el
@@ -343,7 +343,10 @@ present, don't do anything."
       (when (and (mu4e~headers-view-this-message-p docid)
 	      (buffer-live-p mu4e~view-buffer))
 	(with-current-buffer mu4e~view-buffer
-	  (kill-buffer-and-window ))))))
+	  ;; XXX it seems this sometimes fails; investigate;
+	  ;; for now, just ignore the error
+	  (ignore-errors
+	    (kill-buffer-and-window)))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;