* epg.el (epg--start): Don't call "tty" program on W32 platforms.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c34f256b955b51a6c5d6325bb39d7812dfccf2f8..60b25d5ff6634a81f2fc85e5d081f316cd7cd519 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-04  Daiki Ueno  <ueno@gnu.org>
+
+       * epg.el (epg--start): Don't call "tty" program on W32 platforms.
+       Suggested by Eli Zaretskii  <eliz@gnu.org>.
+
 2013-01-04  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp-sh.el (tramp-set-file-uid-gid): UID and GID must be

diff --git a/lisp/epg.el b/lisp/epg.el
index ff32661ada9d4dee6adcc82772465918ad390aba..01f7210c9a9019e7016608882a1ed9266e69e38a 100644 (file)
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1166,12 +1166,13 @@ This function is for internal use only."
     ;; 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
-      (condition-case nil
-         (when (= (call-process "tty" "/dev/fd/0" t) 0)
-           (delete-backward-char 1)
-           (setq terminal-name (buffer-string)))
-       (file-error)))
+    (unless (memq system-type '(ms-dos windows-nt))
+      (with-temp-buffer
+       (condition-case nil
+           (when (= (call-process "tty" "/dev/fd/0" t) 0)
+             (delete-backward-char 1)
+             (setq terminal-name (buffer-string)))
+         (file-error))))
     (when terminal-name
       (setq process-environment
            (cons (concat "GPG_TTY=" terminal-name)