[PATCH v3 2/2] emacs: `notmuch-show-forward-message' can use `notmuch-mua-new-forward-messages'
David Edmondson
dme at dme.org
Mon Feb 8 03:34:22 PST 2016
Which allows `notmuch-mua-new-forward-message' to be removed.
---
emacs/notmuch-mua.el | 20 --------------------
emacs/notmuch-show.el | 4 ++--
2 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 4d50d25..99e23d8 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -405,26 +405,6 @@ the From: address first."
(list (cons 'From (notmuch-mua-prompt-for-sender))))))
(notmuch-mua-mail nil nil other-headers nil (notmuch-mua-get-switch-function))))
-(defun notmuch-mua-new-forward-message (&optional prompt-for-sender)
- "Invoke the notmuch message forwarding window.
-
-The current buffer must contain an RFC2822 message to forward.
-
-If PROMPT-FOR-SENDER is non-nil, the user will be prompted for
-the From: address first."
- (let* ((cur (current-buffer))
- (message-forward-decoded-p nil)
- (subject (message-make-forward-subject))
- (other-headers
- (when (or prompt-for-sender notmuch-always-prompt-for-sender)
- (list (cons 'From (notmuch-mua-prompt-for-sender))))))
- (notmuch-mua-mail nil subject other-headers nil (notmuch-mua-get-switch-function))
- (message-forward-make-body cur)
- ;; `message-forward-make-body' shows the User-agent header. Hide
- ;; it again.
- (message-hide-headers)
- (set-buffer-modified-p nil)))
-
(defun notmuch-mua-new-forward-messages (messages &optional prompt-for-sender)
"Compose a new message forwarding MESSAGES.
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index a8c6f1e..d40cb09 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -1796,8 +1796,8 @@ any effects from previous calls to
(defun notmuch-show-forward-message (&optional prompt-for-sender)
"Forward the current message."
(interactive "P")
- (with-current-notmuch-show-message
- (notmuch-mua-new-forward-message prompt-for-sender)))
+ (notmuch-mua-new-forward-messages (list (notmuch-show-get-message-id))
+ prompt-for-sender))
(put 'notmuch-show-forward-open-messages 'notmuch-prefix-doc
"... and prompt for sender")
--
2.1.4
More information about the notmuch
mailing list