Synch with Gnus.

[elisp/gnus.git-] / contrib / gpg.el

diff --git a/contrib/gpg.el b/contrib/gpg.el
index f2dbbe8..523728c 100644 (file)
--- a/contrib/gpg.el
+++ b/contrib/gpg.el
@@ -796,10 +796,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)