From 064b2486aeb457b481f3dcaafe3cd6f41cf6e103 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Tue, 30 Nov 2010 11:16:44 +0100 Subject: [PATCH] Use gnus-string-match-p Signed-off-by: Julien Danjou --- lisp/ChangeLog | 2 ++ lisp/nnimap.el | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cc7eb0d2e..4253e01b8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2010-11-30 Julien Danjou + * nnimap.el (nnimap-open-connection-1): Use gnus-string-match-p. + * gnus-gravatar.el (gnus-gravatar-size): Set gnus-gravatar-size to nil. 2010-11-30 Katsumi Yamaoka diff --git a/lisp/nnimap.el b/lisp/nnimap.el index 6d2cad496..9aeb0700c 100644 --- a/lisp/nnimap.el +++ b/lisp/nnimap.el @@ -358,9 +358,7 @@ textual parts.") :success " OK " :starttls-function (lambda (capabilities) - (if (not (string-match "STARTTLS" capabilities)) - ;; Not a STARTTLS-capable server. - nil + (when (gnus-string-match-p "STARTTLS" capabilities) "1 STARTTLS\r\n"))) (setf (nnimap-process nnimap-object) stream) (if (not stream) -- 2.25.1