auto upstream

2 files changed, 26 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index afb1ffd06fe..9c3be36984b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-22  Daiki Ueno  <ueno@gnu.org>
+
+        * epg.el (epg-context-pinentry-mode): New function.
+        (epg-context-set-pinentry-mode): New function.
+        (epg--start): Pass --pinentry-mode option to gpg command.
+
 2013-04-21  Xue Fuqiao  <xfq.free@gmail.com>
 
         * comint.el: (comint-dynamic-complete-functions, comint-mode-map):
@@ -53,7 +59,7 @@
 2013-04-19 Masatake YAMATO  <yamato@redhat.com>
 
         * progmodes/sh-script.el (sh-imenu-generic-expression):
-        Handle function names with a single character.   (Bug#11182)
+        Handle function names with a single character.   (Bug#14111)
 
 2013-04-19  Dima Kogan  <dima@secretsauce.net>    (tiny change)
 
diff --git a/lisp/epg.el b/lisp/epg.el
index 3f04aa2e07a..c36de7e4624 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -195,7 +195,7 @@
                 cipher-algorithm digest-algorithm compress-algorithm
                 (list #'epg-passphrase-callback-function)
                 nil
-                nil nil nil nil nil nil)))
+                nil nil nil nil nil nil nil)))
 
 (defun epg-context-protocol (context)
   "Return the protocol used within CONTEXT."
@@ -289,6 +289,12 @@ This function is for internal use only."
     (signal 'wrong-type-argument (list 'epg-context-p context)))
   (aref (cdr context) 14))
 
+(defun epg-context-pinentry-mode (context)
+  "Return the mode of pinentry invocation."
+  (unless (eq (car-safe context) 'epg-context)
+    (signal 'wrong-type-argument (list 'epg-context-p context)))
+  (aref (cdr context) 15))
+
 (defun epg-context-set-protocol (context protocol)
   "Set the protocol used within CONTEXT."
   (unless (eq (car-safe context) 'epg-context)
@@ -407,6 +413,14 @@ This function is for internal use only."
     (signal 'wrong-type-argument (list 'epg-context-p context)))
   (aset (cdr context) 14 operation))
 
+(defun epg-context-set-pinentry-mode (context mode)
+  "Set the mode of pinentry invocation."
+  (unless (eq (car-safe context) 'epg-context)
+    (signal 'wrong-type-argument (list 'epg-context-p context)))
+  (unless (memq mode '(nil ask cancel error loopback))
+    (signal 'epg-error (list "Unknown pinentry mode" mode)))
+  (aset (cdr context) 15 mode))
+
 (defun epg-make-signature (status &optional key-id)
   "Return a signature object."
   (cons 'epg-signature (vector status key-id nil nil nil nil nil nil nil nil
@@ -1152,6 +1166,10 @@ This function is for internal use only."
                        (if (epg-context-textmode context) '("--textmode"))
                        (if (epg-context-output-file context)
                            (list "--output" (epg-context-output-file context)))
+                       (if (epg-context-pinentry-mode context)
+                           (list "--pinentry-mode"
+                                 (symbol-name (epg-context-pinentry-mode
+                                               context))))
                        args))
          (coding-system-for-write 'binary)
          (coding-system-for-read 'binary)