From c4144077b74d17e1ff8326158f3a8407fdbfde9d Mon Sep 17 00:00:00 2001 From: ShengHuo ZHU Date: Fri, 10 Aug 2001 17:23:27 +0000 Subject: [PATCH] 2001-08-07 Andreas Jaeger * gpg.el (gpg-passphrase-forget): Don't cache gpg-passphrase-timer. (gpg-passphrase-store): Check if gpg-passphrase-timer is initialized already. --- contrib/ChangeLog | 7 +++++++ contrib/gpg.el | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 5c2a4faaa..2c857baab 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,10 @@ +2001-08-07 Andreas Jaeger + + * gpg.el (gpg-passphrase-forget): Don't cache + gpg-passphrase-timer. + (gpg-passphrase-store): Check if gpg-passphrase-timer is + initialized already. + 2001-07-30 16:00:00 ShengHuo ZHU From Andreas Fuchs diff --git a/contrib/gpg.el b/contrib/gpg.el index afb85a8ff..3afa1ed13 100644 --- a/contrib/gpg.el +++ b/contrib/gpg.el @@ -7,7 +7,7 @@ ;; Keywords: crypto ;; Created: 2000-04-15 -;; $Id: gpg.el,v 1.13 2001/07/15 20:36:39 zsh Exp $ +;; $Id: gpg.el,v 1.14 2001/07/30 23:04:20 zsh Exp $ ;; This file is NOT (yet?) part of GNU Emacs. @@ -801,6 +801,7 @@ evaluates BODY, like `progn'. If BODY evaluates to `nil' (or "Forget stored passphrase." (interactive) (cancel-timer gpg-passphrase-timer) + (setq gpg-passphrase-timer nil) (gpg-passphrase-clear-string gpg-passphrase) (setq gpg-passphrase nil)) @@ -808,6 +809,8 @@ evaluates BODY, like `progn'. If BODY evaluates to `nil' (or "Store PASSPHRASE in cache. Updates the timeout for clearing the cache to `gpg-passphrase-timeout'." (unless (equal gpg-passphrase-timeout 0) + (if (null gpg-passphrase-timer) + (setq gpg-passphrase-timer (timer-create))) (timer-set-time gpg-passphrase-timer (timer-relative-time (current-time) gpg-passphrase-timeout)) -- 2.34.1