Merge from emacs--devo--0, emacs--rel--22

[gnus] / lisp / imap.el

diff --git a/lisp/imap.el b/lisp/imap.el
index 703218f..8e41c68 100644 (file)
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -966,6 +966,13 @@ Returns t if login was successful, nil otherwise."
          (imap-capability nil buffer))
     mecs))
 
+(declare-function sasl-find-mechanism "sasl" (mechanism))
+(declare-function sasl-mechanism-name "sasl" (mechanism))
+(declare-function sasl-make-client    "sasl" (mechanism name service server))
+(declare-function sasl-next-step      "sasl" (client step))
+(declare-function sasl-step-data      "sasl" (step))
+(declare-function sasl-step-set-data  "sasl" (step data))
+
 (defun imap-sasl-auth-p (buffer)
   (and (condition-case ()
           (require 'sasl)