Fixed.

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

diff --git a/pgg-epg.el b/pgg-epg.el
index e21faa2..6963113 100644 (file)
--- a/pgg-epg.el
+++ b/pgg-epg.el
@@ -30,9 +30,9 @@
 
 (defvar pgg-epg-secret-key-id-list nil)
 
 
 (defvar pgg-epg-secret-key-id-list nil)
 

-(defun pgg-epg-passphrase-callback (key-id ignore)
+(defun pgg-epg-passphrase-callback (context key-id ignore)

   (if (eq key-id 'SYM)
   (if (eq key-id 'SYM)

-      (epg-passphrase-callback-function key-id nil)
+      (epg-passphrase-callback-function context key-id nil)

     (let* ((entry (assoc key-id epg-user-id-alist))
           (passphrase
            (pgg-read-passphrase
     (let* ((entry (assoc key-id epg-user-id-alist))
           (passphrase
            (pgg-read-passphrase

@@ -59,6 +59,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))
 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

        cipher)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
        cipher)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)

@@ -105,6 +106,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))
 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

        plain)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
        plain)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)

@@ -133,6 +135,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))
 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

        signature)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
        signature)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)

@@ -164,7 +167,8 @@ passphrase cache or user."
   "This function is for internal use only.
 
 Verify region between START and END as the detached signature SIGNATURE."
   "This function is for internal use only.
 
 Verify region between START and END as the detached signature SIGNATURE."

-  (let ((context (epg-make-context)))
+  (let ((context (epg-make-context))
+       (inhibit-redisplay t))          ;Some Gnus users hate flickering

     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
     (get-buffer-create pgg-output-buffer)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
     (get-buffer-create pgg-output-buffer)

@@ -189,6 +193,7 @@ Verify region between START and END as the detached signature SIGNATURE."
 
 Insert public key at point."
   (let ((context (epg-make-context))
 
 Insert public key at point."
   (let ((context (epg-make-context))

+       (inhibit-redisplay t)           ;Some Gnus users hate flickering

        pointer)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
        pointer)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)

@@ -199,6 +204,7 @@ Insert public key at point."
 
 Add all public keys in region between START and END to the keyring."
   (let ((context (epg-make-context))
 
 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)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)
        pointer)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context pgg-text-mode)