* pgg.el (pgg-remove-passphrase-cache): Add checking if

the passphrase has already been expired.

diff --git a/ChangeLog b/ChangeLog
index 6b0ae03..11b372d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-30   Daiki Ueno  <ueno@ueda.info.waseda.ac.jp>
+
+       * pgg.el (pgg-remove-passphrase-cache): Add checking whether
+       the passphrase has already been expired.
+
 1999-11-26   Daiki Ueno  <ueno@ueda.info.waseda.ac.jp>
 
        * mime-edit.el (mime-edit-pgp-user-id): New variable.

diff --git a/pgg.el b/pgg.el
index 5058c9c..fd6eaea 100644 (file)
--- a/pgg.el
+++ b/pgg.el
@@ -215,9 +215,10 @@ and END to the keyring.")
               key))
 
 (defun pgg-remove-passphrase-cache (key)
-  (let ((passphrase (symbol-value (intern key pgg-passphrase-cache))))
-    (fillarray passphrase ?_)
-    (unintern key pgg-passphrase-cache)))
+  (let ((passphrase (symbol-value (intern-soft key pgg-passphrase-cache))))
+    (when passphrase
+      (fillarray passphrase ?_)
+      (unintern key pgg-passphrase-cache))))
 
 (defmacro pgg-convert-lbt-region (start end lbt)
   `(let ((pgg-conversion-end (set-marker (make-marker) ,end)))