From: dmaus <dmaus>
Date: Sat, 29 Jan 2011 15:39:13 +0000 (+0000)
Subject: * wl-draft.el (wl-user-agent-compose): Add optional argument
X-Git-Tag: merged-trunk-to-elmo-imap4-compliance-2^2~9
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=b060879d8f216383622de00770d5a084c6e51619;p=elisp%2Fwanderlust.git

* wl-draft.el (wl-user-agent-compose): Add optional argument
  RETURN-ACTION, introduced to `compose-mail' in Emacs 24.

Cf. http://permalink.gmane.org/gmane.emacs.diffs/108339
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 3b21e89..3bd0524 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-29  David Maus  <dmaus@ictsoc.de>
+
+	* wl-draft.el (wl-user-agent-compose): Add optional argument
+	RETURN-ACTION, introduced to `compose-mail' in Emacs 24.
+
 2011-01-09  David Maus  <dmaus@ictsoc.de>
 
 	* wl-template.el (wl-template-select): Reset draft config exec
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 28b73b2..9e966d7 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -2533,10 +2533,10 @@ Automatically applied in draft sending time."
 ;;;###autoload
 (defun wl-user-agent-compose (&optional to subject other-headers continue
 					switch-function yank-action
-					send-actions)
+					send-actions return-action)
   "Support the `compose-mail' interface for wl.
 Only support for TO, SUBJECT, and OTHER-HEADERS has been implemented.
-Support for CONTINUE, YANK-ACTION, and SEND-ACTIONS has not
+Support for CONTINUE, YANK-ACTION, SEND-ACTIONS and RETURN-ACTION has not
 been implemented yet.  Partial support for SWITCH-FUNCTION now supported."
 
   (unless (featurep 'wl)