From 66303262cd5573617ca77c2e8b6736c27759c2ce Mon Sep 17 00:00:00 2001
From: Thierry Volpiatto <thierry.volpiatto@gmail.com>
Date: Sun, 8 Jun 2014 08:24:25 +0200
Subject: [PATCH 1/2] * mu4e/mu4e-main.el (mu4e-main-mode):
 `revert-buffer-function' should be local.

---
 mu4e/mu4e-main.el | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mu4e/mu4e-main.el b/mu4e/mu4e-main.el
index 23fa4bdd..b31fad7b 100644
--- a/mu4e/mu4e-main.el
+++ b/mu4e/mu4e-main.el
@@ -64,11 +64,9 @@
   "Major mode for the mu4e main screen.
 \\{mu4e-main-mode-map}."
   (use-local-map mu4e-main-mode-map)
-  (setq
-    truncate-lines t
-    overwrite-mode 'overwrite-mode-binary
-    revert-buffer-function 'mu4e:main-revert-buffer
-    ))
+  (setq truncate-lines t
+        overwrite-mode 'overwrite-mode-binary)
+  (set (make-local-variable 'revert-buffer-function) #'mu4e:main-revert-buffer))
 
 
 (defun mu4e~main-action-str (str &optional func-or-shortcut)

From 2382abddf326fa2ba6b87c3036d0d4636ad48e8f Mon Sep 17 00:00:00 2001
From: Thierry Volpiatto <thierry.volpiatto@gmail.com>
Date: Wed, 18 Jun 2014 15:33:55 +0200
Subject: [PATCH 2/2] * mu4e/mu4e-compose.el (mu4e~compose-handler): Kill
 buffer on quit, transformed in defun*.

---
 mu4e/mu4e-compose.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index 2320e1b6..b62e096f 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -326,7 +326,7 @@ appear on disk."
 		       mu4e~compose-buffer-max-name-length
 		       nil nil t)))))
 
-(defun mu4e~compose-handler (compose-type &optional original-msg includes)
+(defun* mu4e~compose-handler (compose-type &optional original-msg includes)
   "Create a new draft message, or open an existing one.
 
 COMPOSE-TYPE determines the kind of message to compose and is a
@@ -352,7 +352,10 @@ tempfile)."
   (run-hooks 'mu4e-compose-pre-hook)
 
   ;; this opens (or re-opens) a messages with all the basic headers set.
-  (mu4e-draft-open compose-type original-msg)
+  (condition-case nil
+      (mu4e-draft-open compose-type original-msg)
+    (quit (kill-buffer) (message "[mu4e] Operation aborted")
+          (return-from mu4e~compose-handler)))
   ;; insert mail-header-separator, which is needed by message mode to separate
   ;; headers and body. will be removed before saving to disk
   (mu4e~draft-insert-mail-header-separator)