Merge remote-tracking branch 'origin/emacs-24'

[gnu-emacs] / lisp / epa.el

diff --git a/lisp/epa.el b/lisp/epa.el
index 2814716e7a8a533b02dfa7fd2ab309bc6ff87ca1..07a954511d1a6ed2efdb30aca5406eed1da1fb84 100644 (file)
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -776,15 +776,14 @@ If no one is selected, default secret key is used.  "
     (setf (epg-context-armor context) epa-armor)
     (setf (epg-context-textmode context) epa-textmode)
     (setf (epg-context-signers context) signers)
-    (setf (epg-context-passphrase-callback context)
-         #'epa-passphrase-callback-function)
-    (setf (epg-context-progress-callback context)
-         (cons
-          #'epa-progress-callback-function
-          (format "Signing %s..."
-                  (file-name-nondirectory file))))
-    (if epa-pinentry-mode
-       (setf (epg-context-pinentry-mode context) epa-pinentry-mode))
+    (epg-context-set-passphrase-callback context
+                                        #'epa-passphrase-callback-function)
+    (epg-context-set-progress-callback context
+                                      (cons
+                                       #'epa-progress-callback-function
+                                       (format "Signing %s..."
+                                               (file-name-nondirectory file))))
+    (setf (epg-context-pinentry-mode context) epa-pinentry-mode)
     (message "Signing %s..." (file-name-nondirectory file))
     (condition-case error
        (epg-sign-file context file signature mode)
@@ -808,15 +807,14 @@ If no one is selected, symmetric encryption will be performed.  ")))
        (context (epg-make-context epa-protocol)))
     (setf (epg-context-armor context) epa-armor)
     (setf (epg-context-textmode context) epa-textmode)
-    (setf (epg-context-passphrase-callback context)
-         #'epa-passphrase-callback-function)
-    (setf (epg-context-progress-callback context)
-         (cons
-          #'epa-progress-callback-function
-          (format "Encrypting %s..."
-                  (file-name-nondirectory file))))
-    (if epa-pinentry-mode
-       (setf (epg-context-pinentry-mode context) epa-pinentry-mode))
+    (epg-context-set-passphrase-callback context
+                                        #'epa-passphrase-callback-function)
+    (epg-context-set-progress-callback context
+                                      (cons
+                                       #'epa-progress-callback-function
+                                       (format "Encrypting %s..."
+                                               (file-name-nondirectory file))))
+    (setf (epg-context-pinentry-mode context) epa-pinentry-mode)
     (message "Encrypting %s..." (file-name-nondirectory file))
     (condition-case error
        (epg-encrypt-file context file recipients cipher)
@@ -853,14 +851,13 @@ For example:
   (save-excursion
     (let ((context (epg-make-context epa-protocol))
          plain)
-      (setf (epg-context-passphrase-callback context)
-           #'epa-passphrase-callback-function)
-      (setf (epg-context-progress-callback context)
-           (cons
-            #'epa-progress-callback-function
-            "Decrypting..."))
-      (if epa-pinentry-mode
-         (setf (epg-context-pinentry-mode context) epa-pinentry-mode))
+      (epg-context-set-passphrase-callback context
+                                          #'epa-passphrase-callback-function)
+      (epg-context-set-progress-callback context
+                                        (cons
+                                         #'epa-progress-callback-function
+                                         "Decrypting..."))
+      (setf (epg-context-pinentry-mode context) epa-pinentry-mode)
       (message "Decrypting...")
       (condition-case error
          (setq plain (epg-decrypt-string context (buffer-substring start end)))
@@ -1061,14 +1058,13 @@ If no one is selected, default secret key is used.  "
       ;;(setf (epg-context-textmode context) epa-textmode)
       (setf (epg-context-textmode context) t)
       (setf (epg-context-signers context) signers)
-      (setf (epg-context-passphrase-callback context)
-           #'epa-passphrase-callback-function)
-      (setf (epg-context-progress-callback context)
-           (cons
-            #'epa-progress-callback-function
-            "Signing..."))
-      (if epa-pinentry-mode
-         (setf (epg-context-pinentry-mode context) epa-pinentry-mode))
+      (epg-context-set-passphrase-callback context
+                                          #'epa-passphrase-callback-function)
+      (epg-context-set-progress-callback context
+                                        (cons
+                                         #'epa-progress-callback-function
+                                         "Signing..."))
+      (setf (epg-context-pinentry-mode context) epa-pinentry-mode)
       (message "Signing...")
       (condition-case error
          (setq signature (epg-sign-string context
@@ -1151,14 +1147,13 @@ If no one is selected, symmetric encryption will be performed.  ")
       (setf (epg-context-textmode context) t)
       (if sign
          (setf (epg-context-signers context) signers))
-      (setf (epg-context-passphrase-callback context)
-           #'epa-passphrase-callback-function)
-      (setf (epg-context-progress-callback context)
-           (cons
-            #'epa-progress-callback-function
-            "Encrypting..."))
-      (if epa-pinentry-mode
-         (setf (epg-context-pinentry-mode context) epa-pinentry-mode))
+      (epg-context-set-passphrase-callback context
+                                          #'epa-passphrase-callback-function)
+      (epg-context-set-progress-callback context
+                                        (cons
+                                         #'epa-progress-callback-function
+                                         "Encrypting..."))
+      (setf (epg-context-pinentry-mode context) epa-pinentry-mode)
       (message "Encrypting...")
       (condition-case error
          (setq cipher (epg-encrypt-string context
@@ -1321,14 +1316,13 @@ If no one is selected, default public key is exported.  ")))
 ;;        (error "No keys selected"))
 ;;      (list keys current-prefix-arg)))
 ;;   (let ((context (epg-make-context epa-protocol)))
-;;     (setf (epg-context-passphrase-callback context)
-;;          #'epa-passphrase-callback-function)
-;;     (setf (epg-context-progress-callback context)
-;;          (cons
-;;            #'epa-progress-callback-function
-;;            "Signing keys..."))
-;;     (if epa-pinentry-mode
-;;        (setf (epg-context-pinentry-mode context) epa-pinentry-mode))
+;;     (epg-context-set-passphrase-callback context
+;;                                         #'epa-passphrase-callback-function)
+;;     (epg-context-set-progress-callback context
+;;                                       (cons
+;;                                         #'epa-progress-callback-function
+;;                                         "Signing keys..."))
+;;     (setf (epg-context-pinentry-mode context) epa-pinentry-mode)
 ;;     (message "Signing keys...")
 ;;     (epg-sign-keys context keys local)
 ;;     (message "Signing keys...done")))