Use gnus-string-match-p

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc7eb0d..4253e01 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-11-30  Julien Danjou  <julien@danjou.info>
 
+       * 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  <yamaoka@jpl.org>

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 6d2cad4..9aeb070 100644 (file)
--- 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)