[PATCH 3/4] emacs: Allow the user to choose the "From" address when forwarding a message.

[Thomas Jost]

---
 emacs/notmuch-mua.el  |    8 ++++++++
 emacs/notmuch-show.el |    7 +++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 0bde02c..7c08a6e 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -182,6 +182,14 @@ name and addresses configured in the notmuch configuration file."
   (interactive)
   (notmuch-mua-new-mail t))
 
+(defun notmuch-mua-forward-message-prompt-for-sender ()
+  (interactive)
+  (let* ((sender (notmuch-mua-prompt-for-sender))
+	 (address-components (mail-extract-address-components sender))
+	 (user-full-name (car address-components))
+	 (user-mail-address (cadr address-components)))
+    (notmuch-mua-forward-message)))
+
 (defun notmuch-mua-send-and-exit (&optional arg)
   (interactive "P")
   (message-send-and-exit arg))
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 93f46ac..50b20b2 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -850,6 +850,7 @@ function is used. "
 	(define-key map "m" 'notmuch-mua-new-mail)
 	(define-key map "M" 'notmuch-mua-new-mail-prompt-for-sender)
 	(define-key map "f" 'notmuch-show-forward-message)
+	(define-key map "F" 'notmuch-show-forward-message-prompt-for-sender)
 	(define-key map "r" 'notmuch-show-reply)
 	(define-key map "|" 'notmuch-show-pipe-message)
 	(define-key map "w" 'notmuch-show-save-attachments)
@@ -1165,6 +1166,12 @@ any effects from previous calls to
   (with-current-notmuch-show-message
    (notmuch-mua-forward-message)))
 
+(defun notmuch-show-forward-message-prompt-for-sender ()
+  "Forward the current message, prompting for the From: address first."
+  (interactive)
+  (with-current-notmuch-show-message
+   (notmuch-mua-forward-message-prompt-for-sender)))
+
 (defun notmuch-show-next-message ()
   "Show the next message."
   (interactive)
-- 
1.7.5.1