[Emacs-diffs] /srv/bzr/emacs/trunk r111358: * epg.el (epg--start): Modify process-environment locally.

[Andreas Schwab]

------------------------------------------------------------
revno: 111358
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Fri 2012-12-28 10:49:59 +0100
message:
  * epg.el (epg--start): Modify process-environment locally.
modified:
  lisp/ChangeLog
  lisp/epg.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-28 03:51:20 +0000
+++ b/lisp/ChangeLog    2012-12-28 09:49:59 +0000
@@ -1,3 +1,7 @@
+2012-12-28  Andreas Schwab  <address@hidden>
+
+       * epg.el (epg--start): Modify process-environment locally.
+
 2012-12-28  Daiki Ueno  <address@hidden>
 
        * epg.el: Support pinentry-curses.

=== modified file 'lisp/epg.el'
--- a/lisp/epg.el       2012-12-28 03:51:20 +0000
+++ b/lisp/epg.el       2012-12-28 09:49:59 +0000
@@ -1156,6 +1156,7 @@
         (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
@@ -1170,8 +1171,9 @@
        (delete-backward-char 1)
        (setq terminal-name (buffer-string))))
     (when terminal-name
-      (setenv "GPG_TTY" terminal-name)
-      (setenv "TERM" "xterm"))
+      (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