X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=pgg-epg.el;h=27b6e4295481ca3af694298ecf474133bf38cf49;hb=d00ee5e0ec545a77b645d8faaf6961deb7073346;hp=c93ffc7c7f5d02c4243e7995e0340e9c69d324b0;hpb=7341b0360a1902cf7a7414607fd7fa4f5b1d829e;p=elisp%2Fepg.git

diff --git a/pgg-epg.el b/pgg-epg.el
index c93ffc7..27b6e42 100644
--- a/pgg-epg.el
+++ b/pgg-epg.el
@@ -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))
@@ -162,7 +162,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