X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=pgg-epg.el;h=86c61550d1d685fbd03a6139f1e2adbb61915c1d;hb=f975f60b84c0d7fb9c34bd26e410511a1a0ca29f;hp=09f69f0749e413722f45edd28ed56a55d6b71c8d;hpb=ffff78acbd3106bff74aba533617b35122fd5fa9;p=elisp%2Fepg.git

diff --git a/pgg-epg.el b/pgg-epg.el
index 09f69f0..86c6155 100644
--- a/pgg-epg.el
+++ b/pgg-epg.el
@@ -29,14 +29,14 @@
 
 ;;; Code:
 
-(require 'epg)
+(require 'epa)
 (eval-when-compile (require 'pgg))
 
 (defvar pgg-epg-secret-key-id-list nil)
 
 (defun pgg-epg-passphrase-callback (context key-id ignore)
   (if (eq key-id 'SYM)
-      (epg-passphrase-callback-function context key-id nil)
+      (epa-passphrase-callback-function context key-id nil)
     (let* ((entry (assoc key-id epg-user-id-alist))
 	   (passphrase
 	    (pgg-read-passphrase
@@ -132,7 +132,8 @@ passphrase cache or user."
 	 (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
+    (if (and pgg-text-mode
+	     (fboundp 'decode-coding-string))
 	(setq plain (decode-coding-string plain 'raw-text)))
     (save-excursion
       (set-buffer (get-buffer-create pgg-output-buffer))
@@ -252,7 +253,7 @@ Add all public keys in region between START and END to the keyring."
 	     (fprint (epg-signature-fingerprint (car pgg-epg-signatures)))
 	     (trust-good-enough-p
 	      (memq (epg-signature-validity (car pgg-epg-signatures))
-		    '(marginal fully ultimate))))
+		    '(marginal full ultimate))))
 	(cond ((and signer fprint)
 	       (concat (cdr signer)
 		       (unless trust-good-enough-p