[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111422: * epg.el (epg--start): Don't
From: |
Daiki Ueno |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111422: * epg.el (epg--start): Don't call "tty" program on W32 platforms. |
Date: |
Sat, 05 Jan 2013 07:51:52 +0900 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111422
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Sat 2013-01-05 07:51:52 +0900
message:
* epg.el (epg--start): Don't call "tty" program on W32 platforms.
modified:
lisp/ChangeLog
lisp/epg.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-01-04 19:22:37 +0000
+++ b/lisp/ChangeLog 2013-01-04 22:51:52 +0000
@@ -1,3 +1,8 @@
+2013-01-04 Daiki Ueno <address@hidden>
+
+ * epg.el (epg--start): Don't call "tty" program on W32 platforms.
+ Suggested by Eli Zaretskii <address@hidden>.
+
2013-01-04 Michael Albinus <address@hidden>
* net/tramp-sh.el (tramp-set-file-uid-gid): UID and GID must be
=== modified file 'lisp/epg.el'
--- a/lisp/epg.el 2013-01-03 23:56:51 +0000
+++ b/lisp/epg.el 2013-01-04 22:51:52 +0000
@@ -1166,12 +1166,13 @@
;; 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111422: * epg.el (epg--start): Don't call "tty" program on W32 platforms.,
Daiki Ueno <=