Synch to No Gnus 200501262303.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b1a2d6..45e8b3d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-27  Simon Josefsson  <jas@extundo.com>
+
+       * password.el (password-cache-add): Only start one timer per key.
+       Reported by Derek Atkins <warlord@MIT.EDU>.
+
 2005-01-26  Steve Youngs  <steve@sxemacs.org>
 
        * run-at-time.el: Removed.  It is no longer needed as

diff --git a/lisp/password.el b/lisp/password.el
index 5e64808..00defc2 100644 (file)
--- a/lisp/password.el
+++ b/lisp/password.el
@@ -115,11 +115,11 @@ user again."
   "Add password to cache.
 The password is removed by a timer after `password-cache-expiry'
 seconds."
-  (set (intern key password-data) password)
-  (when password-cache-expiry
+  (when (and password-cache-expiry (null (intern-soft key password-data)))
     (run-at-time password-cache-expiry nil
                 #'password-cache-remove
                 key))
+  (set (intern key password-data) password)
   nil)
 
 (provide 'password)