Typo.

[elisp/semi.git] / pgg.el

diff --git a/pgg.el b/pgg.el
index e2e1123..fd6eaea 100644 (file)
--- a/pgg.el
+++ b/pgg.el
@@ -201,7 +201,8 @@ and END to the keyring.")
            (setq pgg-read-passphrase 'read-passwd)
          (autoload 'ange-ftp-read-passwd "ange-ftp")
          (setq pgg-read-passphrase 'ange-ftp-read-passwd))))
-  (or (and key (setq key (pgg-truncate-key-identifier key))
+  (or (and pgg-cache-passphrase
+          key (setq key (pgg-truncate-key-identifier key))
           (symbol-value (intern-soft key pgg-passphrase-cache)))
       (funcall pgg-read-passphrase prompt)))
 
@@ -214,11 +215,10 @@ and END to the keyring.")
               key))
 
 (defun pgg-remove-passphrase-cache (key)
-  (let ((passphrase (symbol-value (intern key pgg-passphrase-cache))))
-    (fillarray passphrase ?_)
-    (let ((obarray pgg-passphrase-cache))
-      (makunbound key))
-    (unintern key pgg-passphrase-cache)))
+  (let ((passphrase (symbol-value (intern-soft key pgg-passphrase-cache))))
+    (when passphrase
+      (fillarray passphrase ?_)
+      (unintern key pgg-passphrase-cache))))
 
 (defmacro pgg-convert-lbt-region (start end lbt)
   `(let ((pgg-conversion-end (set-marker (make-marker) ,end)))