* mail/smtpmail.el: Use password-cache.

2 files changed, 18 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 876928350ba..3b588094479 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 57d06c08dfc..a8d95cf1420 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -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 @@ This is relative to `smtpmail-queue-dir'.")
                              (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 @@ This is relative to `smtpmail-queue-dir'.")
        (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)