* Makefile.in (install-package-ja): Compile and install lisp files first.

[elisp/gnus.git-] / lisp / read-passwd.el

diff --git a/lisp/read-passwd.el b/lisp/read-passwd.el
index 896c085..4542604 100644 (file)
--- a/lisp/read-passwd.el
+++ b/lisp/read-passwd.el
@@ -26,6 +26,7 @@
 ;;
 ;;
 (require 'mail-source)
+(provide 'read-passwd)
 
 (defun read-pw-read-passwd (prompt)
   (read-pw-read-noecho prompt t))
@@ -63,7 +64,7 @@ Argument PROMPT ."
              (1+ (- (length msg) (window-width (minibuffer-window)))))
        (and (> truncate 0)
             (setq msg (concat "$" (substring msg (1+ truncate))))))
-      (message msg)
+      (message "%s" msg)
       (setq c (read-pw-read-char-exclusive))
       (cond ((eq ?\C-g c)
             (setq quit-flag t
@@ -86,19 +87,21 @@ 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)
+             (when (eq 'pop (car x))
+               (mail-source-bind (pop x)
+                 (let ((from (format "%s:%s:%s" server user port))
+                       (mail-source-string
+                        (format "pop:%s@%s" 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))))))
+           mail-sources))))
 ;;
 ;;
 (defvar passwd nil)
@@ -107,4 +110,4 @@ Argument PROMPT ."
                (message "POP Password for %s at %s : " user server)))
   passwd)
 ;;
-(provide 'read-passwd)
+;; read-passwd.el ends here.