From: ueno <ueno>
Date: Fri, 28 Apr 2006 22:13:36 +0000 (+0000)
Subject: Fixed.
X-Git-Tag: epg-0_0_1~3
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=71a13a1a2d2aad16b9020f932db41067915abfc3;p=elisp%2Fepg.git

Fixed.
---

diff --git a/pgg-epg.el b/pgg-epg.el
index 6963113..730d61d 100644
--- a/pgg-epg.el
+++ b/pgg-epg.el
@@ -23,6 +23,10 @@
 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 ;; Boston, MA 02110-1301, USA.
 
+;;; Commentary:
+
+;; To use, add (setq pgg-scheme 'epg) to your ~/.gnus.
+
 ;;; Code:
 
 (require 'epg)
@@ -49,6 +53,7 @@
 	      (cons key-id pgg-epg-secret-key-id-list))
 	(copy-sequence passphrase)))))
 
+(defvar inhibit-redisplay)
 (defun pgg-epg-encrypt-region (start end recipients &optional sign passphrase)
   "This function is for internal use only.
 
@@ -59,7 +64,7 @@ If optional argument SIGN is non-nil, do a combined sign and encrypt.
 If optional PASSPHRASE is not specified, it will be obtained from the
 passphrase cache or user."
   (let ((context (epg-make-context))
-	(inhibit-redisplay t)		;Some Gnus users hate flickering
+	(inhibit-redisplay t)		;Gnus users don't like flickering
 	cipher)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
@@ -106,7 +111,7 @@ Decrypt the current region between START and END.
 If optional PASSPHRASE is not specified, it will be obtained from the
 passphrase cache or user."
   (let ((context (epg-make-context))
-	(inhibit-redisplay t)		;Some Gnus users hate flickering
+	(inhibit-redisplay t)		;Gnus users don't like flickering
 	plain)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
@@ -135,7 +140,7 @@ Make detached signature from text between START and END.
 If optional PASSPHRASE is not specified, it will be obtained from the
 passphrase cache or user."
   (let ((context (epg-make-context))
-	(inhibit-redisplay t)		;Some Gnus users hate flickering
+	(inhibit-redisplay t)		;Gnus users don't like flickering
 	signature)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
@@ -168,7 +173,7 @@ passphrase cache or user."
 
 Verify region between START and END as the detached signature SIGNATURE."
   (let ((context (epg-make-context))
-	(inhibit-redisplay t))		;Some Gnus users hate flickering
+	(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)
@@ -193,23 +198,29 @@ Verify region between START and END as the detached signature SIGNATURE."
 
 Insert public key at point."
   (let ((context (epg-make-context))
-	(inhibit-redisplay t)		;Some Gnus users hate flickering
-	pointer)
+	(inhibit-redisplay t)		;Gnus users don't like flickering
+	)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
-    (insert (epg-export-keys context pgg-default-user-id))))
+    (get-buffer-create pgg-output-buffer)
+    (get-buffer-create pgg-errors-buffer)
+    (insert (epg-export-keys-to-string context pgg-default-user-id))))
 
 (defun pgg-epg-snarf-keys-region (start end)
   "This function is for internal use only.
 
 Add all public keys in region between START and END to the keyring."
   (let ((context (epg-make-context))
-	(inhibit-redisplay t)		;Some Gnus users hate flickering
-	pointer)
+	(inhibit-redisplay t)		;Gnus users don't like flickering
+	)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
-    (epg-import-keys context (buffer-substring start end))))
+    (get-buffer-create pgg-output-buffer)
+    (get-buffer-create pgg-errors-buffer)
+    (epg-import-keys-from-string context (buffer-substring start end))))
 
+(eval-when-compile
+  (autoload 'mml2015-gpg-pretty-print-fpr "mml2015"))
 (defun mml2015-gpg-extract-signature-details ()
   (if pgg-epg-signatures
       (let* ((expired (eq (epg-signature-status (car pgg-epg-signatures))