emacs: notmuch-show-forward-message' can use notmuch-mua-new-forward-messages'

Which allows `notmuch-mua-new-forward-message' to be removed.
This commit is contained in:
David Edmondson 2016-02-08 11:34:22 +00:00 committed by David Bremner
parent a982773dfb
commit dc13fcbf87
2 changed files with 2 additions and 22 deletions

View file

@ -407,26 +407,6 @@ the From: address first."
(list (cons 'From (notmuch-mua-prompt-for-sender)))))) (list (cons 'From (notmuch-mua-prompt-for-sender))))))
(notmuch-mua-mail nil nil other-headers nil (notmuch-mua-get-switch-function)))) (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) (defun notmuch-mua-new-forward-messages (messages &optional prompt-for-sender)
"Compose a new message forwarding MESSAGES. "Compose a new message forwarding MESSAGES.

View file

@ -1856,8 +1856,8 @@ any effects from previous calls to
(defun notmuch-show-forward-message (&optional prompt-for-sender) (defun notmuch-show-forward-message (&optional prompt-for-sender)
"Forward the current message." "Forward the current message."
(interactive "P") (interactive "P")
(with-current-notmuch-show-message (notmuch-mua-new-forward-messages (list (notmuch-show-get-message-id))
(notmuch-mua-new-forward-message prompt-for-sender))) prompt-for-sender))
(put 'notmuch-show-forward-open-messages 'notmuch-prefix-doc (put 'notmuch-show-forward-open-messages 'notmuch-prefix-doc
"... and prompt for sender") "... and prompt for sender")