emacs: Explicitly set the From address when composing a new message.

Previously, underlying emacs code was setting this header. Now, we do the
right thing and query the notmuch configuration for the default value here.

2 files changed, 19 insertions, 3 deletions

diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index 91132b5..abcbfa1 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -68,13 +68,25 @@ the user hasn't set this variable with the old or new value."
 	(match-string 2 long-string)
       "unknown")))
 
-(defun notmuch-database-path ()
-  "Return the database.path value from the notmuch configuration."
+(defun notmuch-config-get (item)
+  "Return a value from the notmuch configuration."
   ;; Trim off the trailing newline
   (substring (shell-command-to-string
-	      (concat notmuch-command " config get database.path"))
+	      (concat notmuch-command " config get " item))
 	      0 -1))
 
+(defun notmuch-database-path ()
+  "Return the database.path value from the notmuch configuration."
+  (notmuch-config-get "database.path"))
+
+(defun notmuch-user-name ()
+  "Return the user.name value from the notmuch configuration."
+  (notmuch-config-get "user.name"))
+
+(defun notmuch-user-primary-email ()
+  "Return the user.primary_email value from the notmuch configuration."
+  (notmuch-config-get "user.primary_email"))
+
 ;;
 
 ;; XXX: This should be a generic function in emacs somewhere, not
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 0ad079f..ddaec67 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -126,6 +126,10 @@ list."
       (when (not (string= "" user-agent))
 	(push (cons "User-Agent" user-agent) other-headers))))
 
+  (unless (assoc "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)