2000-12-14 10:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* gpg.el (gpg-passphrase-store): Don't activate timer if it is live.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index da72e83..f32980b 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-14 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gpg.el (gpg-passphrase-store): Don't activate timer if it is live.
+
 2000-11-30 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gpg.el: (gpg-make-temp-file): Use expand-file-name.
@@ -8,7 +12,7 @@
        (gpg-with-temp-files): Ditto.
        (gpg-show-result): Ditto.
 
-2000-11-08  Bj\e,Av\e(Brn Torkelsson  <torkel@hpc2n.umu.se>
+2000-11-08  Bj\e-Aörn Torkelsson  <torkel@hpc2n.umu.se>\e$)A
 
        * gpg.el: In Xemacs it is called point-at-eol, not
        line-end-position

diff --git a/contrib/gpg.el b/contrib/gpg.el
index 09e1d59..79b9091 100644 (file)
--- a/contrib/gpg.el
+++ b/contrib/gpg.el
@@ -7,7 +7,7 @@
 ;; Keywords: crypto
 ;; Created: 2000-04-15
 
-;; $Id: gpg.el,v 1.4 2000/12/01 04:01:39 zsh Exp $
+;; $Id: gpg.el,v 1.5 2000/12/01 04:13:45 zsh Exp $
 
 ;; This file is NOT (yet?) part of GNU Emacs.
 
@@ -798,10 +798,12 @@ Updates the timeout for clearing the cache to `gpg-passphrase-timeout'."
                    (timer-relative-time (current-time) 
                                         gpg-passphrase-timeout))
     (timer-set-function gpg-passphrase-timer 'gpg-passphrase-forget)
-    (timer-activate gpg-passphrase-timer)
+    (unless (and (fboundp 'itimer-live-p)
+                (itimer-live-p gpg-passphrase-timer))
+      (timer-activate gpg-passphrase-timer))
     (setq gpg-passphrase passphrase))
   passphrase)
-  
+
 (defun gpg-passphrase-read ()
   "Read a passphrase and remember it for some time."
   (interactive)