emacs: Suppress window creation when replying

The buffer used to edit a reply should overlay the original
message. Encourage this by setting `same-window-regexps' locally.

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index acb7dbf0e2202e065e31e55a64c35bad3fbc05a3..e9b76f103c01d832bb3bd9eaae84dba047f28f4e 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -72,12 +72,16 @@
              (setq headers (mail-header-extract)))))
       (forward-line 1)
       (setq body (buffer-substring (point) (point-max))))
              (setq headers (mail-header-extract)))))
       (forward-line 1)
       (setq body (buffer-substring (point) (point-max))))

-    (notmuch-mua-mail (mail-header 'to headers)
-                     (mail-header 'subject headers)
-                     (loop for header in headers
-                           if (not (or (eq 'to (car header))
-                                       (eq 'subject (car header))))
-                           collect header))
+    (let
+       ;; Overlay the composition window on that being used to read
+       ;; the original message.
+       ((same-window-regexps '("\\*mail .*")))
+      (notmuch-mua-mail (mail-header 'to headers)
+                       (mail-header 'subject headers)
+                       (loop for header in headers
+                             if (not (or (eq 'to (car header))
+                                         (eq 'subject (car header))))
+                             collect header)))

     (message-sort-headers)
     (message-hide-headers)
     (save-excursion
     (message-sort-headers)
     (message-hide-headers)
     (save-excursion