Fixed.

[elisp/epg.git] / pgg-epg.el

diff --git a/pgg-epg.el b/pgg-epg.el
index a6ede0e..27b6e42 100644 (file)
--- a/pgg-epg.el
+++ b/pgg-epg.el
@@ -1,10 +1,10 @@
-;;; pgg-epg.el --- Gnus/PGG backend of EasyPG.
+;;; pgg-epg.el --- Gnus' PGG backend of EasyPG.
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
 ;;   2005, 2006 Free Software Foundation, Inc.
 ;; Copyright (C) 2006 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
-;; Keywords: PGP, GnuPG
+;; Keywords: PGP, GnuPG, Gnus
 
 ;; This file is part of EasyPG.
 
@@ -69,8 +69,11 @@ passphrase cache or user."
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
     (epg-context-set-passphrase-callback context #'pgg-epg-passphrase-callback)
-    (get-buffer-create pgg-output-buffer)
-    (get-buffer-create pgg-errors-buffer)
+    (save-excursion
+      (set-buffer (get-buffer-create pgg-output-buffer))
+      (erase-buffer)
+      (set-buffer (get-buffer-create pgg-errors-buffer))
+      (erase-buffer))
     (condition-case error
        (setq cipher
              (epg-encrypt-string context
@@ -90,7 +93,6 @@ passphrase cache or user."
        (signal (car error) (cdr error))))
     (save-excursion
       (set-buffer (get-buffer-create pgg-output-buffer))
-      (erase-buffer)
       (insert cipher))
     t))
 
@@ -116,19 +118,24 @@ passphrase cache or user."
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
     (epg-context-set-passphrase-callback context #'pgg-epg-passphrase-callback)
-    (get-buffer-create pgg-output-buffer)
-    (get-buffer-create pgg-errors-buffer)
+    (save-excursion
+      (set-buffer (get-buffer-create pgg-output-buffer))
+      (erase-buffer)
+      (set-buffer (get-buffer-create pgg-errors-buffer))
+      (erase-buffer))
     (condition-case error
-       (setq plain (epg-decrypt-string context (buffer-substring start end))
+       (setq plain
+             (epg-decrypt-string context (buffer-substring start end))
              pgg-epg-secret-key-id-list nil)
       (error
        (while pgg-epg-secret-key-id-list
         (pgg-remove-passphrase-from-cache (car pgg-epg-secret-key-id-list))
         (setq pgg-epg-secret-key-id-list (cdr pgg-epg-secret-key-id-list)))
        (signal (car error) (cdr error))))
+    (if pgg-text-mode
+       (setq plain (decode-coding-string plain 'raw-text)))
     (save-excursion
       (set-buffer (get-buffer-create pgg-output-buffer))
-      (erase-buffer)
       (insert plain))
     t))
 
@@ -145,14 +152,17 @@ passphrase cache or user."
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
     (epg-context-set-passphrase-callback context #'pgg-epg-passphrase-callback)
-    (get-buffer-create pgg-output-buffer)
-    (get-buffer-create pgg-errors-buffer)
+    (save-excursion
+      (set-buffer (get-buffer-create pgg-output-buffer))
+      (erase-buffer)
+      (set-buffer (get-buffer-create pgg-errors-buffer))
+      (erase-buffer))
     (condition-case error
        (setq signature
              (epg-sign-string context
                               (buffer-substring start end)
                               (if cleartext
-                                  'clearsign
+                                  'clear
                                 'detached))
              pgg-epg-secret-key-id-list nil)
       (error
@@ -162,7 +172,6 @@ passphrase cache or user."
        (signal (car error) (cdr error))))
     (save-excursion
       (set-buffer (get-buffer-create pgg-output-buffer))
-      (erase-buffer)
       (insert signature))
     t))
 
@@ -176,8 +185,11 @@ Verify region between START and END as the detached signature SIGNATURE."
        (inhibit-redisplay t))          ;Gnus users don't like flickering
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
-    (get-buffer-create pgg-output-buffer)
-    (get-buffer-create pgg-errors-buffer)
+    (save-excursion
+      (set-buffer (get-buffer-create pgg-output-buffer))
+      (erase-buffer)
+      (set-buffer (get-buffer-create pgg-errors-buffer))
+      (erase-buffer))
     (if signature
        (epg-verify-string context
                           (with-temp-buffer
@@ -189,7 +201,6 @@ Verify region between START and END as the detached signature SIGNATURE."
       (set-buffer (get-buffer-create pgg-errors-buffer))
       (make-local-variable 'pgg-epg-signatures)
       (setq pgg-epg-signatures (epg-context-result-for context 'verify))
-      (erase-buffer)
       (insert (epg-verify-result-to-string pgg-epg-signatures)))
     t))
 
@@ -202,8 +213,11 @@ Insert public key at point."
        )
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
-    (get-buffer-create pgg-output-buffer)
-    (get-buffer-create pgg-errors-buffer)
+    (save-excursion
+      (set-buffer (get-buffer-create pgg-output-buffer))
+      (erase-buffer)
+      (set-buffer (get-buffer-create pgg-errors-buffer))
+      (erase-buffer))
     (insert (epg-export-keys-to-string context pgg-default-user-id))))
 
 (defun pgg-epg-snarf-keys-region (start end)
@@ -215,8 +229,11 @@ Add all public keys in region between START and END to the keyring."
        )
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
-    (get-buffer-create pgg-output-buffer)
-    (get-buffer-create pgg-errors-buffer)
+    (save-excursion
+      (set-buffer (get-buffer-create pgg-output-buffer))
+      (erase-buffer)
+      (set-buffer (get-buffer-create pgg-errors-buffer))
+      (erase-buffer))
     (epg-import-keys-from-string context (buffer-substring start end))))
 
 (eval-when-compile