[PATCH 1/3] emacs: Don't overload same-window-regexps

[Aneesh Kumar K.V]

From: Aneesh Kumar K.V <aneesh.kumar at gmail.com>

Also add unset mail to the regexps. Recent emacs changes change the buffer name

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at gmail.com>
---
 emacs/notmuch-mua.el |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 0ad079f..23ffd96 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -85,10 +85,13 @@ list."
 	      (setq headers (mail-header-extract)))))
       (forward-line 1)
       (setq body (buffer-substring (point) (point-max))))
-    (let
+    (progn
 	;; Overlay the composition window on that being used to read
 	;; the original message.
-	((same-window-regexps '("\\*mail .*")))
+      (add-hook 'same-window-regexps
+		(purecopy "\\*unsent mail.*"))
+      (add-hook 'same-window-regexps
+		(purecopy "\\*mail .*"))
       (notmuch-mua-mail (mail-header 'to headers)
 			(mail-header 'subject headers)
 			(message-headers-to-generate headers t '(to subject))))
-- 
1.7.1