X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fread-passwd.el;h=694214ef02693bfc8a383389d6ea844a0fc44591;hb=779dd81d09cb6fa76e6a0fd64147099b7cf0119d;hp=6f3c712236ef6d383b6ec135ce5fc2ce0687a759;hpb=145daa03890334c98aacb711e8b8c4f55efa103e;p=elisp%2Fgnus.git-

diff --git a/lisp/read-passwd.el b/lisp/read-passwd.el
index 6f3c712..694214e 100644
--- a/lisp/read-passwd.el
+++ b/lisp/read-passwd.el
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 ;;
 ;;
 (require 'mail-source)
@@ -64,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
@@ -90,17 +90,18 @@ Argument PROMPT ."
   (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 "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)))))
-	    nnmail-spool-file))))
+	      (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)
@@ -109,4 +110,4 @@ Argument PROMPT ."
 		(message "POP Password for %s at %s : " user server)))
   passwd)
 ;;
-;; read-passwd.el ends here.
\ No newline at end of file
+;; read-passwd.el ends here.