From: dmaus <dmaus>
Date: Sun, 4 Dec 2011 19:35:17 +0000 (+0000)
Subject: Merged trunk to branch elmo-imap4-new-search
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Felmo-imap4-new-search;p=elisp%2Fwanderlust.git

Merged trunk to branch elmo-imap4-new-search
---

diff --git a/NEWS b/NEWS
index c28552b..9b83aa9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,10 @@
+
 Wanderlust NEWS -- User-visible changes in Wanderlust.
 
 * Changes in 2.16.0 from 2.14.x
 
+** Added support for sending mail with sendmail package
+
 ** Prevent accidental loss of messages when renaming IMAP folder
 
 ** Put spam mark on the message registered as spam.
diff --git a/wl/ChangeLog b/wl/ChangeLog
index 9cb66e4..0d00c4e 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,25 @@
+2011-07-20  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* wl-e21.el (wl-e21-make-toolbar-buttons): No need to take care of
+	the tool-bar default bindings for Emacs 24.
+
+2011-07-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* wl-e21.el (wl-e21-make-toolbar-buttons): Work around the Emacs
+	24 error: "`keymap' is reserved for embedded parent maps"
+
+2011-07-15  Herbert J. Skuhra  <hskuhra@fastmail.fm>
+
+	* wl-folder.el (wl-folder-open-unread-folder): Fix typo in
+	message.
+
+2011-07-10  David Maus  <dmaus@ictsoc.de>
+
+	* wl-draft.el (wl-draft-send-mail-with-sendmail): New
+	function. Send mail with sendmail package.
+	* wl-vars.el (wl-draft-send-mail-function): Add function to list
+	of prepared send mail functions.
+
 2011-06-03  Erik Hetzner  <egh@e6h.org>
 
 	* wl-vars.el (wl-summary-line-format): Document missing control
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 9e966d7..b05eac1 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1126,6 +1126,22 @@ non-nil."
 	 (signal (car error) (cdr error))))))
   (wl-draft-send-mail-with-smtp))
 
+(defun wl-draft-send-mail-with-sendmail ()
+  "Send the prepared message buffer with `sendmail-send-it'.
+The function `sendmail-send-it' uses the external program
+`sendmail-program'."
+  (let ((id (std11-field-body "message-id"))
+	(to (std11-field-body "to")))
+    (run-hooks 'wl-mail-send-pre-hook)
+    (require 'sendmail)
+    (condition-case err
+	(sendmail-send-it)
+      (error
+       (wl-draft-write-sendlog 'failed 'sendmail nil (list to) id)
+       (signal (car err) (cdr err))))
+    (wl-draft-set-sent-message 'mail 'sent)
+    (wl-draft-write-sendlog 'ok 'sendmail nil (list to) id)))
+
 (defun wl-draft-insert-required-fields (&optional force-msgid)
   "Insert Message-ID, Date, and From field.
 If FORCE-MSGID, insert message-id regardless of `wl-insert-message-id'."
diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index 89bdaa7..c2487c5 100644
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -223,9 +223,10 @@
   ;; Invalidate the default bindings.
   (let ((keys (cdr (key-binding [tool-bar] t)))
 	item)
-    (while (setq item (pop keys))
-      (when (setq item (car-safe item))
-	(define-key keymap (vector 'tool-bar item) 'undefined))))
+    (unless (eq (caar keys) 'keymap) ;; Emacs >= 24
+      (while (setq item (pop keys))
+	(when (setq item (car-safe item))
+	  (define-key keymap (vector 'tool-bar item) 'undefined)))))
   (let ((n (length defs))
 	def)
     (while (>= n 0)
diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index 7eac53f..33b3dc9 100644
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -2418,7 +2418,7 @@ Use `wl-subscribed-mailing-list'."
       (while path-list
 	(wl-folder-open-folder-sub (car path-list))
 	(setq path-list (cdr path-list)))
-      (message "%s unread folder"
+      (message "%s unread message(s)"
 	       (if (> unread 0) unread "No")))))
 
 (defun wl-folder-open-unread-current-entity ()
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 568be98..170d744 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -898,8 +898,10 @@ reasons of system internal to accord facilities for the Emacs variants.")
 (defcustom wl-draft-send-mail-function 'wl-draft-send-mail-with-smtp
   "A function to send mail.
 Prepared candidates are 'wl-draft-send-mail-with-smtp,
-'wl-draft-send-mail-with-qmail and 'wl-draft-send-mail-with-pop-before-smtp."
+'wl-draft-send-mail-with-sendmail, 'wl-draft-send-mail-with-qmail
+and 'wl-draft-send-mail-with-pop-before-smtp."
   :type '(radio (function-item wl-draft-send-mail-with-smtp)
+		(function-item wl-draft-send-mail-with-sendmail)
 		(function-item wl-draft-send-mail-with-qmail)
 		(function-item wl-draft-send-mail-with-pop-before-smtp)
 		(function :tag "Other"))