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

[gnus] / lisp / sieve-manage.el

diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el
index b9b18c3..5cf14f7 100644 (file)
--- a/lisp/sieve-manage.el
+++ b/lisp/sieve-manage.el
@@ -76,7 +76,8 @@
 
 ;;; Code:
 
-(require 'password)
+(or (require 'password-cache nil t)
+    (require 'password))
 (eval-when-compile
   (require 'sasl)
   (require 'starttls))
@@ -197,7 +198,7 @@ Valid states are `closed', `initial', `nonauth', and `auth'.")
 (defun sieve-manage-interactive-login (buffer loginfunc)
   "Login to server in BUFFER.
 LOGINFUNC is passed a username and a password, it should return t if
-it where sucessful authenticating itself to the server, nil otherwise.
+it was successful authenticating itself to the server, nil otherwise.
 Returns t if login was successful, nil otherwise."
   (with-current-buffer buffer
     (make-local-variable 'sieve-manage-username)