* mime-edit.el: Fix autoload settings for `smime-sign-region' and

[elisp/semi.git] / pgg.el

diff --git a/pgg.el b/pgg.el
index 4c76ce4..fd6eaea 100644 (file)
--- a/pgg.el
+++ b/pgg.el
@@ -156,7 +156,6 @@ and END to the keyring.")
        (let ((buffer (current-buffer)))
         (with-temp-buffer
           (let (buffer-undo-list)
-            (set-buffer-multibyte nil)
             (insert-buffer-substring buffer ,start ,end)
             (encode-coding-region (point-min)(point-max)
                                   buffer-file-coding-system)
@@ -202,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)))
 
@@ -215,7 +215,10 @@ and END to the keyring.")
               key))
 
 (defun pgg-remove-passphrase-cache (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)))