From: Michal Sojka <sojkam1@fel.cvut.cz>
To: notmuch@notmuchmail.org
Subject: [PATCH 3/3] emacs: Handle switch-function argument of notmuch-mua-mail
Date: Sat, 2 Jan 2016 17:47:45 +0100 [thread overview]
Message-ID: <1451753265-26713-4-git-send-email-sojkam1@fel.cvut.cz> (raw)
In-Reply-To: <1451753265-26713-1-git-send-email-sojkam1@fel.cvut.cz>
notmuch-mua-mail ignored the switch-function argument and always used
the function returned by notmuch-mua-get-switch-function instead. In
order to support standard emacs interfaces (compose-mail in this
case), this commit changes notmuch-mua-mail to use the switch-function
argument if it is non-nil and notmuch-mua-get-switch-function
otherwise.
---
emacs/notmuch-mua.el | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 2d6825d..45a6daa 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -278,7 +278,7 @@ Note that these functions use `mail-citation-hook' if that is non-nil."
(define-key notmuch-message-mode-map (kbd "C-c C-c") #'notmuch-mua-send-and-exit)
(define-key notmuch-message-mode-map (kbd "C-c C-s") #'notmuch-mua-send)
-(defun notmuch-mua-pop-to-buffer (name)
+(defun notmuch-mua-pop-to-buffer (name switch-function)
"Pop to buffer NAME, and warn if it already exists and is
modified. This function is notmuch addaptation of
`message-pop-to-buffer'."
@@ -291,7 +291,7 @@ modified. This function is notmuch addaptation of
(progn
(gnus-select-frame-set-input-focus (window-frame window))
(select-window window))
- (funcall (notmuch-mua-get-switch-function) buffer)
+ (funcall switch-function buffer)
(set-buffer buffer))
(when (and (buffer-modified-p)
(not (prog1
@@ -299,7 +299,7 @@ modified. This function is notmuch addaptation of
"Message already being composed; erase? ")
(message nil))))
(error "Message being composed")))
- (funcall (notmuch-mua-get-switch-function) name)
+ (funcall switch-function name)
(set-buffer name))
(erase-buffer)
(notmuch-message-mode)))
@@ -319,7 +319,8 @@ modified. This function is notmuch addaptation of
(push (cons 'From (concat
(notmuch-user-name) " <" (notmuch-user-primary-email) ">")) other-headers))
- (notmuch-mua-pop-to-buffer (message-buffer-name "mail" to))
+ (notmuch-mua-pop-to-buffer (message-buffer-name "mail" to)
+ (or switch-function (notmuch-mua-get-switch-function)))
(let ((headers
;; The following sexp is copied from `message-mail'
(nconc
--
2.6.4
next prev parent reply other threads:[~2016-01-02 16:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-02 16:47 notmuch-message-mode initialization follow-up Michal Sojka
2016-01-02 16:47 ` [PATCH 1/3] emacs: Fix mail composition under Emacs 23 Michal Sojka
2016-01-05 2:33 ` David Bremner
2016-01-06 21:27 ` Michal Sojka
2016-01-06 21:28 ` [PATCH] emacs: Don't use nconc on quoted list Michal Sojka
2016-01-02 16:47 ` [PATCH 2/3] emacs: Refactor notmuch-mua-mail Michal Sojka
2016-01-02 16:47 ` Michal Sojka [this message]
2016-01-08 12:41 ` [PATCH 3/3] emacs: Handle switch-function argument of notmuch-mua-mail David Bremner
2016-01-02 18:20 ` notmuch-message-mode initialization follow-up Tomi Ollila
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1451753265-26713-4-git-send-email-sojkam1@fel.cvut.cz \
--to=sojkam1@fel.cvut.cz \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).