From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Tue, 27 Sep 2011 17:45:18 +0000 (+0200)
Subject: * mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection.
X-Git-Tag: emacs-pretest-24.0.91~260^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=85a162088f56ec197b7ccc6d2f9ad23a691a362d;p=emacs.git

* mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection.

Fixes: debbugs:9615
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50dccb43b3b..8bbb7f5fcc8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection
+	(bug#9615).
+
 2011-09-27  Chong Yidong  <cyd@stupidchicken.com>
 
 	* emacs-lisp/package.el (list-packages): Fix echo area message.
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 1c6f2c7b7ed..edcc82011af 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -658,7 +658,7 @@ The list is in preference order.")
 		   :always-query-capabilities t
 		   :starttls-function
 		   (lambda (capabilities)
-		     (and (string-match "-STARTTLS" capabilities)
+		     (and (string-match "[ -]STARTTLS" capabilities)
 			  "STARTTLS\r\n"))
 		   :client-certificate t
 		   :use-starttls-if-possible t)))