[PATCH] compose-mail accepts an 8th argument in emacs 24.

[richardmu...@gmail.com]

Fix for emacs 24

[richardmu...@gmail.com]

On Fri, 26 Aug 2011 09:46:27 -0300, David Bremner  wrote:
> Thanks for sending a patch. I'm sure we need lots of help to get notmuch
> working well with emacs24. Some comments about your patch
> 
> - It would be nice to have a bit more informative single line summary to
>   start the patch.
> 
> - I don't really understand from the long commit message what problem
>   this fixes. I take it some function outside of notmuch is calling
>   notmuch-mua-mail? 
> 
> - The convention on the notmuch list is to use "git send-email" if you
>   can. This makes it easier to apply patches.  Any discussion not meant
>   to be part of the commit message can go after the --- at the end of the
>   commit message (and I admit that isn't very obvious).
> 
> Thanks again, and welcome to the team ;)


Here is the following snippet from the emacs changelog for emacs 24:

** `compose-mail' now accepts an optional 8th arg, RETURN-ACTION, and
passes it to the mail user agent function.  This argument specifies an
action for returning to the caller after finishing with the mail.
This is currently used by Rmail to delete a mail window.


compose-mail is run when creating a new email.  It breaks horribly
without a spot for the optional argument, however most mail agents don't
use the argument at all.  By just including the extra argument, most
everything works well with notmuch in emacs 24.

Fix for emacs 24

[richardmu...@gmail.com]

>From c034e4567dc08f81708f6ab8ac974c9b8b83a508 Mon Sep 17 00:00:00 2001
Date: Mon, 1 Aug 2011 10:48:31 -0600
Subject: [PATCH] Update for emacs 24.

Emacs added another parameter to the send mail functions.  This caused
emacs to error out.
---
 emacs/notmuch-mua.el |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index 274c5da..808e184 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -125,7 +125,8 @@ list."
   (message-goto-to))

 (defun notmuch-mua-mail (&optional to subject other-headers continue
-  switch-function yank-action send-actions)
+  switch-function yank-action send-actions
+  return-action)
   "Invoke the notmuch mail composition window."
   (interactive)

-- 
1.7.6