summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/epg.el8
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 @@
+2013-01-03 Daiki Ueno <ueno@gnu.org>
+
+ * epg.el (epg--start): Ignore errors when /dev/fd/0 does not
+ exist. (Bug#13344)
+
2013-01-03 Glenn Morris <rgm@gnu.org>
* 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."
;; 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))))
+ (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)