diff options
| author | David Edmondson <dme@dme.org> | 2016-02-08 11:34:22 +0000 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2016-03-24 08:02:15 -0300 |
| commit | dc13fcbf8755506b2681ef3c44da98737ddab8e8 (patch) | |
| tree | 30d0da778c8d83780e22888498aeb316d29cec5e | |
| parent | a982773dfb6e8efe1bcee90e888f2560ad006fb5 (diff) | |
emacs: `notmuch-show-forward-message' can use `notmuch-mua-new-forward-messages'
Which allows `notmuch-mua-new-forward-message' to be removed.
| -rw-r--r-- | emacs/notmuch-mua.el | 20 | ||||
| -rw-r--r-- | 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 1c3b2a23..cfdac0ef 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -407,26 +407,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 b0d639bf..245114b7 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -1856,8 +1856,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") |