X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=pgg-epg.el;h=224535e0bb746d4ddb9f0c0641e39e36966e18b5;hb=787dcffb3033312a719954e88d9d05aa5d15803d;hp=f126dbd10adb48011d8f9c82c4a78bb66970e823;hpb=9571bc9c4d0dae57f34a6a64a5a82331f0de35bf;p=elisp%2Fepg.git

diff --git a/pgg-epg.el b/pgg-epg.el
index f126dbd..224535e 100644
--- a/pgg-epg.el
+++ b/pgg-epg.el
@@ -1,4 +1,4 @@
-;;; 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
@@ -125,15 +125,15 @@ passphrase cache or user."
       (erase-buffer))
     (condition-case error
 	(setq plain
-	      (decode-coding-string
-	       (epg-decrypt-string context (buffer-substring start end))
-	       'raw-text)
+	      (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))
       (insert plain))
@@ -152,6 +152,9 @@ 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)
+    (epg-context-set-signers
+     context
+     (list (car (epg-list-keys context pgg-default-user-id t))))
     (save-excursion
       (set-buffer (get-buffer-create pgg-output-buffer))
       (erase-buffer)
@@ -162,7 +165,7 @@ passphrase cache or user."
 	      (epg-sign-string context
 			       (buffer-substring start end)
 			       (if cleartext
-				   'clearsign
+				   'clear
 				 'detached))
 	      pgg-epg-secret-key-id-list nil)
       (error