X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-mua.el;h=bca20db95168e86396c7946e10437f4c1bd95041;hb=6408270512dd654243b81ed57b81dad3f721938c;hp=acb7dbf0e2202e065e31e55a64c35bad3fbc05a3;hpb=45ad21fba18730cdf76725b8a132fc52ba4190a7;p=notmuch

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index acb7dbf0..bca20db9 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -23,6 +23,7 @@
 (require 'message)
 
 (require 'notmuch-lib)
+(require 'notmuch-address)
 
 ;;
 
@@ -40,6 +41,12 @@
 	     notmuch-mua-user-agent-notmuch
 	     notmuch-mua-user-agent-emacs))
 
+(defcustom notmuch-mua-hidden-headers '("^User-Agent:")
+  "Headers that are added to the `message-mode' hidden headers
+list."
+  :group 'notmuch
+  :type '(repeat string))
+
 ;;
 
 (defun notmuch-mua-user-agent-full ()
@@ -56,6 +63,13 @@
   "Generate a `User-Agent:' string suitable for notmuch."
   (concat "Emacs/" emacs-version " (" system-configuration ")"))
 
+(defun notmuch-mua-add-more-hidden-headers ()
+  "Add some headers to the list that are hidden by default."
+  (mapc (lambda (header)
+	  (when (not (member header 'message-hidden-headers))
+	    (push header message-hidden-headers)))
+	notmuch-mua-hidden-headers))
+
 (defun notmuch-mua-reply (query-string)
   (let (headers body)
     ;; This make assumptions about the output of `notmuch reply', but
@@ -72,12 +86,16 @@
 	      (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
@@ -107,6 +125,7 @@
 
   (message-mail to subject other-headers continue
 		switch-function yank-action send-actions)
+  (message-sort-headers)
   (message-hide-headers))
 
 (defun notmuch-mua-send-and-exit (&optional arg)
@@ -128,6 +147,10 @@ simply runs the corresponding `message-mode' hook functions."
   'notmuch-mua-mail 'notmuch-mua-send-and-exit
   'notmuch-mua-kill-buffer 'notmuch-mua-send-hook)
 
+;; Add some more headers to the list that `message-mode' hides when
+;; composing a message.
+(notmuch-mua-add-more-hidden-headers)
+
 ;;
 
 (provide 'notmuch-mua)