diff options
| author | Daiki Ueno | 2013-01-04 08:56:51 +0900 |
|---|---|---|
| committer | Daiki Ueno | 2013-01-04 08:56:51 +0900 |
| commit | c2cf1829ddd72c4fa24e7def8d94e8b2ee937a03 (patch) | |
| tree | 720937c5824a22ecf126a9fce7560816647ebabb | |
| parent | a8aa6c2d08c5bf67cae9db62663e69fb183fbddb (diff) | |
| download | emacs-c2cf1829ddd72c4fa24e7def8d94e8b2ee937a03.tar.gz emacs-c2cf1829ddd72c4fa24e7def8d94e8b2ee937a03.zip | |
* epg.el (epg--start): Ignore errors when /dev/fd/0 does not exist.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/epg.el | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3aae01b9f1e..f327b929e56 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-01-03 Daiki Ueno <ueno@gnu.org> | ||
| 2 | |||
| 3 | * epg.el (epg--start): Ignore errors when /dev/fd/0 does not | ||
| 4 | exist. (Bug#13344) | ||
| 5 | |||
| 1 | 2013-01-03 Glenn Morris <rgm@gnu.org> | 6 | 2013-01-03 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * mail/rmail.el (rmail-set-header-1): Ignore case. | 8 | * mail/rmail.el (rmail-set-header-1): Ignore case. |
diff --git a/lisp/epg.el b/lisp/epg.el index 6be3ba15a97..ff32661ada9 100644 --- a/lisp/epg.el +++ b/lisp/epg.el | |||
| @@ -1167,9 +1167,11 @@ This function is for internal use only." | |||
| 1167 | ;; use `terminal-name' here to get the real pty name for the child | 1167 | ;; use `terminal-name' here to get the real pty name for the child |
| 1168 | ;; process, though /dev/fd/0" is not portable. | 1168 | ;; process, though /dev/fd/0" is not portable. |
| 1169 | (with-temp-buffer | 1169 | (with-temp-buffer |
| 1170 | (when (= (call-process "tty" "/dev/fd/0" t) 0) | 1170 | (condition-case nil |
| 1171 | (delete-backward-char 1) | 1171 | (when (= (call-process "tty" "/dev/fd/0" t) 0) |
| 1172 | (setq terminal-name (buffer-string)))) | 1172 | (delete-backward-char 1) |
| 1173 | (setq terminal-name (buffer-string))) | ||
| 1174 | (file-error))) | ||
| 1173 | (when terminal-name | 1175 | (when terminal-name |
| 1174 | (setq process-environment | 1176 | (setq process-environment |
| 1175 | (cons (concat "GPG_TTY=" terminal-name) | 1177 | (cons (concat "GPG_TTY=" terminal-name) |