From 5c07e1dfc89615d91eb014483307ac325eadbd05 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 1 May 2003 15:59:36 +0000 Subject: [PATCH] Synch to Oort Gnus 200305011603. --- contrib/ChangeLog | 5 +++++ contrib/gpg.el | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index d18affe..e290ca9 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2003-05-01 Vasily Korytov + + * gpg.el (gpg-passphrase-forget): Check that gpg-passphrase is + set. + 2003-04-17 Steve Youngs * hashcash.el (hashcash-point-at-bol): Move the fbound test diff --git a/contrib/gpg.el b/contrib/gpg.el index a747594..9362788 100644 --- 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. -- 1.7.10.4