# HG changeset patch
# User Bastien Guerry <bzg@altern.org>
# Date 1202939561 0
# Node ID f084b6fae1f08759cc2c6a81816e42cfe9a0acab
# Parent  76dc0b81d4c0293520cfd63ab4f67b7ba33232cd
* mail/smtpmail.el: Use password-cache.

diff -r 76dc0b81d4c0 -r f084b6fae1f0 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Feb 13 21:08:59 2008 +0000
+++ b/lisp/ChangeLog	Wed Feb 13 21:52:41 2008 +0000
@@ -1,3 +1,14 @@
+2008-02-13  Bastien Guerry  <bzg@altern.org>
+
+	* mail/rmail.el (rmail-header-name): New face.
+	(rmail-font-lock-keywords): Use rmail-header-name.
+
+	* mail/smtpmail.el: Use password-cache.
+
+	* mail/rmail-spam-filter.el (rsf-definitions-alist): Allow check
+	against X-Spam-Status header field.
+	(rmail-spam-filter): Also check X-Spam-Status header field.
+
 2008-02-14  Mark A. Hershberger  <mah@everybody.org>
 
 	* progmodes/flymake.el (flymake-allowed-file-name-masks): Add
diff -r 76dc0b81d4c0 -r f084b6fae1f0 lisp/mail/smtpmail.el
--- a/lisp/mail/smtpmail.el	Wed Feb 13 21:08:59 2008 +0000
+++ b/lisp/mail/smtpmail.el	Wed Feb 13 21:52:41 2008 +0000
@@ -78,6 +78,7 @@
 (autoload 'netrc-parse "netrc")
 (autoload 'netrc-machine "netrc")
 (autoload 'netrc-get "netrc")
+(autoload 'password-read "password") ; for new emacsen: "password-cache"
 
 ;;;
 (defgroup smtpmail nil
@@ -546,12 +547,12 @@
                              (netrc-get hostentry "password"))))
 		 (smtpmail-find-credentials
 		  smtpmail-auth-credentials host port)))
+	 (prompt (when cred (format "SMTP password for %s:%s: "
+				    (smtpmail-cred-server cred)
+				    (smtpmail-cred-port cred))))
 	 (passwd (when cred
 		   (or (smtpmail-cred-passwd cred)
-		       (read-passwd
-			(format "SMTP password for %s:%s: "
-				(smtpmail-cred-server cred)
-				(smtpmail-cred-port cred))))))
+		       (password-read prompt prompt))))
 	 ret)
     (when (and cred mech)
       (cond
@@ -621,9 +622,8 @@
        (t
 	(error "Mechanism %s not implemented" mech)))
       ;; Remember the password.
-      (when (and (not (stringp smtpmail-auth-credentials))
-		 (null (smtpmail-cred-passwd cred)))
-	(setcar (cdr (cdr (cdr cred))) passwd)))))
+      (when (null (smtpmail-cred-passwd cred))
+	(password-cache-add prompt passwd)))))
 
 (defun smtpmail-via-smtp (recipient smtpmail-text-buffer)
   (let ((process nil)