[Emacs-diffs] /srv/bzr/emacs/trunk r105942: * mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105942
fixes bug(s): http://debbugs.gnu.org/9615
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2011-09-27 19:45:18 +0200
message:
  * mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection.
modified:
  lisp/ChangeLog
  lisp/mail/smtpmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-27 15:58:13 +0000
+++ b/lisp/ChangeLog    2011-09-27 17:45:18 +0000
@@ -1,3 +1,8 @@
+2011-09-27  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection
+       (bug#9615).
+
 2011-09-27  Chong Yidong  <address@hidden>
 
        * emacs-lisp/package.el (list-packages): Fix echo area message.

=== modified file 'lisp/mail/smtpmail.el'
--- a/lisp/mail/smtpmail.el     2011-09-18 07:36:20 +0000
+++ b/lisp/mail/smtpmail.el     2011-09-27 17:45:18 +0000
@@ -658,7 +658,7 @@
                   :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)))