lisp/read-password.el (read-pw-set-mail-source-passwd-cache): Do not input password...

diff --git a/ChangeLog b/ChangeLog
index feafb1d..4380c8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 
        * lisp/gnus.el (gnus-variable-list): Undo my last change.
 
+       * lisp/read-password.el (read-pw-set-mail-source-passwd-cache): Do
+       not input password if mail-source-password-cache is non nil.
+
 1999-02-03   Hidekazu Nakamura <u90121@uis-inf.co.jp>
 
        * lisp/read-passwd.el (read-pw-set-mail-source-passwd-cache): To

diff --git a/lisp/read-passwd.el b/lisp/read-passwd.el
index 896c085..b62d183 100644 (file)
--- a/lisp/read-passwd.el
+++ b/lisp/read-passwd.el
@@ -86,19 +86,20 @@ Argument PROMPT ."
 ;;
 (defvar pw nil)
 (defun read-pw-set-mail-source-passwd-cache ()
-  (car (mapcar
-       (lambda (x)
-         (mail-source-bind (pop x)
-           (let ((from (format "%s:%s:%s" server user port))
-                 (mail-source-string (format "%s:%s@%s" (car x) user server)))
-             (setq pw (read-pw-return-passwd-string user server))
-             (unless (assoc user mail-source-password-cache)
-               (set-alist 'mail-source-password-cache
-                          (format "%s:%s:%s" server user port)
-                          pw))
-             (cdr (assoc from mail-source-password-cache)))))
-;;     gnus-offline-mail-source)))
-       nnmail-spool-file)))
+  (if (not mail-source-password-cache)
+      (car (mapcar
+           (lambda (x)
+             (mail-source-bind (pop x)
+               (let ((from (format "%s:%s:%s" server user port))
+                     (mail-source-string
+                      (format "%s:%s@%s" (car x) user server)))
+                 (setq pw (read-pw-return-passwd-string user server))
+                 (unless (assoc user mail-source-password-cache)
+                   (set-alist 'mail-source-password-cache
+                              (format "%s:%s:%s" server user port)
+                              pw))
+                 (cdr (assoc from mail-source-password-cache)))))
+           nnmail-spool-file))))
 ;;
 ;;
 (defvar passwd nil)