Synch to Oort Gnus 200305011603.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index d18affe..e290ca9 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-01  Vasily Korytov  <deskpot@despammed.com>
+
+       * gpg.el (gpg-passphrase-forget): Check that gpg-passphrase is
+       set. 
+
 2003-04-17  Steve Youngs  <youngs@xemacs.org>
 
        * hashcash.el (hashcash-point-at-bol): Move the fbound test

diff --git a/contrib/gpg.el b/contrib/gpg.el
index a747594..9362788 100644 (file)
--- a/contrib/gpg.el
+++ b/contrib/gpg.el
@@ -798,10 +798,11 @@ evaluates BODY, like `progn'.  If BODY evaluates to `nil' (or
 (defun gpg-passphrase-forget ()
   "Forget stored passphrase."
   (interactive)
-  (cancel-timer gpg-passphrase-timer)
-  (setq gpg-passphrase-timer nil)
-  (gpg-passphrase-clear-string gpg-passphrase)
-  (setq gpg-passphrase nil))
+  (when gpg-passphrase
+    (cancel-timer gpg-passphrase-timer)
+    (setq gpg-passphrase-timer nil)
+    (gpg-passphrase-clear-string gpg-passphrase)
+    (setq gpg-passphrase nil)))
 
 (defun gpg-passphrase-store (passphrase)
   "Store PASSPHRASE in cache.