Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[gnu-emacs] / lisp / epg.el

diff --git a/lisp/epg.el b/lisp/epg.el
index 340fc76fb8c94efe5b35793fd811610760f0460d..6be3ba15a9739ab5fae8a0b6866610863971827a 100644 (file)
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -37,6 +37,8 @@
 (defvar epg-key-id nil)
 (defvar epg-context nil)
 (defvar epg-debug-buffer nil)
+(defvar epg-agent-file nil)
+(defvar epg-agent-mtime nil)
 
 ;; from gnupg/include/cipher.h
 (defconst epg-cipher-algorithm-alist
@@ -161,6 +163,7 @@
 (defvar epg-prompt-alist nil)
 
 (put 'epg-error 'error-conditions '(epg-error error))
+(put 'epg-error 'error-message "GPG error")
 
 (defun epg-make-data-from-file (file)
   "Make a data object from FILE."
@@ -970,7 +973,8 @@ This function is for internal use only."
   "Convert SIGNATURE to a human readable string."
   (let* ((user-id (cdr (assoc (epg-signature-key-id signature)
                              epg-user-id-alist)))
-        (pubkey-algorithm (epg-signature-pubkey-algorithm signature)))
+        (pubkey-algorithm (epg-signature-pubkey-algorithm signature))
+        (key-id (epg-signature-key-id signature)))
     (concat
      (cond ((eq (epg-signature-status signature) 'good)
            "Good signature from ")
@@ -984,7 +988,7 @@ This function is for internal use only."
            "Signature made by revoked key ")
           ((eq (epg-signature-status signature) 'no-pubkey)
            "No public key for "))
-     (epg-signature-key-id signature)
+     key-id
      (if user-id
         (concat " "
                 (if (stringp user-id)
@@ -1130,12 +1134,12 @@ This function is for internal use only."
             (if (eq (epg-context-protocol context) 'CMS)
                 epg-gpgsm-program
               epg-gpg-program)))
-  (let* ((args (append (list "--no-tty"
+  (let* ((agent-info (getenv "GPG_AGENT_INFO"))
+        (args (append (list "--no-tty"
                             "--status-fd" "1"
                             "--yes")
                       (if (and (not (eq (epg-context-protocol context) 'CMS))
-                               (string-match ":" (or (getenv "GPG_AGENT_INFO")
-                                                     "")))
+                               (string-match ":" (or agent-info "")))
                           '("--use-agent"))
                       (if (and (not (eq (epg-context-protocol context) 'CMS))
                                (epg-context-progress-callback context))
@@ -1152,16 +1156,42 @@ This function is for internal use only."
         (coding-system-for-write 'binary)
         (coding-system-for-read 'binary)
         process-connection-type
+        (process-environment process-environment)
         (orig-mode (default-file-modes))
         (buffer (generate-new-buffer " *epg*"))
-        process)
+        process
+        terminal-name
+        agent-file
+        (agent-mtime '(0 0 0 0)))
+    ;; Set GPG_TTY and TERM for pinentry-curses.  Note that we can't
+    ;; use `terminal-name' here to get the real pty name for the child
+    ;; process, though /dev/fd/0" is not portable.
+    (with-temp-buffer
+      (when (= (call-process "tty" "/dev/fd/0" t) 0)
+       (delete-backward-char 1)
+       (setq terminal-name (buffer-string))))
+    (when terminal-name
+      (setq process-environment
+           (cons (concat "GPG_TTY=" terminal-name)
+                 (cons "TERM=xterm" process-environment))))
+    ;; Record modified time of gpg-agent socket to restore the Emacs
+    ;; frame on text terminal in `epg-wait-for-completion'.
+    ;; See
+    ;; <http://lists.gnu.org/archive/html/emacs-devel/2007-02/msg00755.html>
+    ;; for more details.
+    (when (and agent-info (string-match "\\(.*\\):[0-9]+:[0-9]+" agent-info))
+      (setq agent-file (match-string 1 agent-info)
+           agent-mtime (or (nth 5 (file-attributes agent-file)) '(0 0 0 0))))
     (if epg-debug
        (save-excursion
          (unless epg-debug-buffer
            (setq epg-debug-buffer (generate-new-buffer " *epg-debug*")))
          (set-buffer epg-debug-buffer)
          (goto-char (point-max))
-         (insert (format "%s %s\n"
+         (insert (if agent-info
+                     (format "GPG_AGENT_INFO=%s\n" agent-info)
+                   "GPG_AGENT_INFO is not set\n")
+                 (format "%s %s\n"
                          (if (eq (epg-context-protocol context) 'CMS)
                              epg-gpgsm-program
                           epg-gpg-program)
@@ -1180,7 +1210,11 @@ This function is for internal use only."
       (make-local-variable 'epg-key-id)
       (setq epg-key-id nil)
       (make-local-variable 'epg-context)
-      (setq epg-context context))
+      (setq epg-context context)
+      (make-local-variable 'epg-agent-file)
+      (setq epg-agent-file agent-file)
+      (make-local-variable 'epg-agent-mtime)
+      (setq epg-agent-mtime agent-mtime))
     (unwind-protect
        (progn
          (set-default-file-modes 448)
@@ -1257,6 +1291,13 @@ This function is for internal use only."
     (accept-process-output (epg-context-process context) 1))
   ;; This line is needed to run the process-filter right now.
   (sleep-for 0.1)
+  ;; Restore Emacs frame on text terminal, when pinentry-curses has terminated.
+  (if (with-current-buffer (process-buffer (epg-context-process context))
+       (and epg-agent-file
+            (> (float-time (or (nth 5 (file-attributes epg-agent-file))
+                               '(0 0 0 0)))
+               (float-time epg-agent-mtime))))
+      (redraw-frame))
   (epg-context-set-result-for
    context 'error
    (nreverse (epg-context-result-for context 'error))))