[Emacs-diffs] [emacs] 01/02: epg: Simplify epa-pinentry-mode handling

[Daiki Ueno]

branch: master
commit 5224be2f7401bd9999b5442a94d0b2abf7f4da3b
Author: Daiki Ueno <address@hidden>
Date:   Tue Nov 18 14:49:30 2014 +0900

    epg: Simplify epa-pinentry-mode handling
    
    * epa-file.el (epa-file-insert-file-contents)
    (epa-file-write-region): Remove redundant check of
    epa-pinentry-mode.
    * epa.el (epa-sign-file, epa-encrypt-file, epa-decrypt-region)
    (epa-sign-region, epa-encrypt-region): Remove redundant check of
    epa-pinentry-mode.
---
 lisp/ChangeLog   |    9 +++++++++
 lisp/epa-file.el |    6 ++----
 lisp/epa.el      |   18 ++++++------------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 462d004..928c89c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
 2014-11-18  Daiki Ueno  <address@hidden>
 
+       * epa-file.el (epa-file-insert-file-contents)
+       (epa-file-write-region): Remove redundant check of
+       epa-pinentry-mode.
+       * epa.el (epa-sign-file, epa-encrypt-file, epa-decrypt-region)
+       (epa-sign-region, epa-encrypt-region): Remove redundant check of
+       epa-pinentry-mode.
+
+2014-11-18  Daiki Ueno  <address@hidden>
+
        * epa-file.el (epa-file-insert-file-contents): Don't show
        "*Error*" buffer if input file does not exist.
        Reported by Herbert J. Skuhra.
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index cdaa8ba..2e46cf9 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -144,8 +144,7 @@ encryption is used."
      context
      (cons #'epa-progress-callback-function
           (format "Decrypting %s" file)))
-    (if epa-pinentry-mode
-       (setf (epg-context-pinentry-mode context) epa-pinentry-mode))
+    (setf (epg-context-pinentry-mode context) epa-pinentry-mode)
     (unwind-protect
        (progn
          (if replace
@@ -233,8 +232,7 @@ encryption is used."
      (cons #'epa-progress-callback-function
           (format "Encrypting %s" file)))
     (setf (epg-context-armor context) epa-armor)
-    (if epa-pinentry-mode
-       (setf (epg-context-pinentry-mode context) epa-pinentry-mode))
+    (setf (epg-context-pinentry-mode context) epa-pinentry-mode)
     (condition-case error
        (setq string
              (epg-encrypt-string
diff --git a/lisp/epa.el b/lisp/epa.el
index 2814716..8b95261 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -783,8 +783,7 @@ If no one is selected, default secret key is used.  "
           #'epa-progress-callback-function
           (format "Signing %s..."
                   (file-name-nondirectory file))))
-    (if epa-pinentry-mode
-       (setf (epg-context-pinentry-mode context) epa-pinentry-mode))
+    (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)
@@ -815,8 +814,7 @@ If no one is selected, symmetric encryption will be 
performed.  ")))
           #'epa-progress-callback-function
           (format "Encrypting %s..."
                   (file-name-nondirectory file))))
-    (if epa-pinentry-mode
-       (setf (epg-context-pinentry-mode context) epa-pinentry-mode))
+    (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)
@@ -859,8 +857,7 @@ For example:
            (cons
             #'epa-progress-callback-function
             "Decrypting..."))
-      (if epa-pinentry-mode
-         (setf (epg-context-pinentry-mode context) epa-pinentry-mode))
+      (setf (epg-context-pinentry-mode context) epa-pinentry-mode)
       (message "Decrypting...")
       (condition-case error
          (setq plain (epg-decrypt-string context (buffer-substring start end)))
@@ -1067,8 +1064,7 @@ If no one is selected, default secret key is used.  "
            (cons
             #'epa-progress-callback-function
             "Signing..."))
-      (if epa-pinentry-mode
-         (setf (epg-context-pinentry-mode context) epa-pinentry-mode))
+      (setf (epg-context-pinentry-mode context) epa-pinentry-mode)
       (message "Signing...")
       (condition-case error
          (setq signature (epg-sign-string context
@@ -1157,8 +1153,7 @@ If no one is selected, symmetric encryption will be 
performed.  ")
            (cons
             #'epa-progress-callback-function
             "Encrypting..."))
-      (if epa-pinentry-mode
-         (setf (epg-context-pinentry-mode context) epa-pinentry-mode))
+      (setf (epg-context-pinentry-mode context) epa-pinentry-mode)
       (message "Encrypting...")
       (condition-case error
          (setq cipher (epg-encrypt-string context
@@ -1327,8 +1322,7 @@ If no one is selected, default public key is exported.  
")))
 ;;          (cons
 ;;            #'epa-progress-callback-function
 ;;            "Signing keys..."))
-;;     (if epa-pinentry-mode
-;;        (setf (epg-context-pinentry-mode context) epa-pinentry-mode))
+;;     (setf (epg-context-pinentry-mode context) epa-pinentry-mode)
 ;;     (message "Signing keys...")
 ;;     (epg-sign-keys context keys local)
 ;;     (message "Signing keys...done")))