Typo.

[elisp/semi.git] / pgg.el

diff --git a/pgg.el b/pgg.el
index 326a570..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)))
@@ -346,11 +349,13 @@ signer's public key from `pgg-default-keyserver-address'."
                   (luna-send entity 'verify-region entity 
                              (point-min)(point-max) signature)))
     (when (interactive-p)
-      (with-output-to-temp-buffer pgg-echo-buffer
-       (set-buffer standard-output)
-       (insert-buffer-substring (if status pgg-output-buffer
-                                  pgg-errors-buffer))
-       ))
+      (let ((temp-buffer-show-function
+            (function pgg-temp-buffer-show-function)))
+       (with-output-to-temp-buffer pgg-echo-buffer
+         (set-buffer standard-output)
+         (insert-buffer-substring (if status pgg-output-buffer
+                                    pgg-errors-buffer))
+         )))
     status))
 
 ;;;###autoload