emacs: Allow the user to choose the "From" address when composing a new message

[notmuch] / emacs / notmuch-mua.el

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 9fbb94a668342f06821597d8d4c50fe509fa9ef4..c792732ba5530b8db856cb77393c18600de0702a 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -19,7 +19,6 @@
 ;;
 ;; Authors: David Edmondson <dme@dme.org>
 
-(require 'cl)
 (require 'message)
 
 (require 'notmuch-lib)
@@ -92,16 +91,11 @@ list."
        ((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)
+                       (message-headers-to-generate headers t '(to subject))))
     ;; insert the message body - but put it in front of the signature
     ;; if one is present
     (goto-char (point-max))
-    (if (re-search-backward "-- " nil t)
+    (if (re-search-backward message-signature-separator nil t)
          (forward-line -1)
       (goto-char (point-max)))
     (insert body))
@@ -124,6 +118,7 @@ list."
 
 (defun notmuch-mua-mail (&optional to subject other-headers continue
                                   switch-function yank-action send-actions)
+  "Invoke the notmuch mail composition window."
   (interactive)
 
   (when notmuch-mua-user-agent-function
@@ -131,6 +126,10 @@ list."
       (when (not (string= "" user-agent))
        (push (cons "User-Agent" user-agent) other-headers))))
 
+  (unless (mail-header 'from other-headers)
+    (push (cons "From" (concat
+                       (notmuch-user-name) " <" (notmuch-user-primary-email) ">")) other-headers))
+
   (message-mail to subject other-headers continue
                switch-function yank-action send-actions)
   (message-sort-headers)
@@ -139,6 +138,40 @@ list."
 
   (message-goto-to))
 
+(defcustom notmuch-identities nil
+  "Identities that can be used as the From: address when composing a new message.
+
+If this variable is left unset, then a list will be constructed from the
+name and addresses configured in the notmuch configuration file."
+  :group 'notmuch
+  :type '(repeat string))
+
+(defun notmuch-mua-sender-collection ()
+  (if notmuch-identities
+      notmuch-identities
+    (mapcar (lambda (address)
+             (concat (notmuch-user-name) " <" address ">"))
+           (cons (notmuch-user-primary-email) (notmuch-user-other-email)))))
+
+(defvar notmuch-mua-sender-history nil)
+
+(defun notmuch-mua-prompt-for-sender ()
+  (interactive)
+  (let ((collection (notmuch-mua-sender-collection)))
+    (ido-completing-read "Send mail From: " collection
+                        nil 'confirm nil 'notmuch-mua-sender-history (car collection))))
+
+(defun notmuch-mua-new-mail (&optional prompt-for-sender)
+  "Invoke the notmuch mail composition window.
+
+If PROMPT-FOR-SENDER is non-nil, the user will be prompted for
+the From: address first."
+  (interactive "P")
+  (let ((other-headers
+        (when prompt-for-sender
+          (list (cons 'from (notmuch-mua-prompt-for-sender))))))
+    (notmuch-mua-mail nil nil other-headers)))
+
 (defun notmuch-mua-send-and-exit (&optional arg)
   (interactive "P")
   (message-send-and-exit arg))