emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r111412: * epg.el (epg--start): Ignor


From: Daiki Ueno
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r111412: * epg.el (epg--start): Ignore errors when /dev/fd/0 does not exist.
Date: Fri, 04 Jan 2013 08:56:51 +0900
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 111412
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Fri 2013-01-04 08:56:51 +0900
message:
  * epg.el (epg--start): Ignore errors when /dev/fd/0 does not exist.
modified:
  lisp/ChangeLog
  lisp/epg.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-03 19:41:59 +0000
+++ b/lisp/ChangeLog    2013-01-03 23:56:51 +0000
@@ -1,3 +1,8 @@
+2013-01-03  Daiki Ueno  <address@hidden>
+
+       * epg.el (epg--start): Ignore errors when /dev/fd/0 does not
+       exist.  (Bug#13344)
+
 2013-01-03  Glenn Morris  <address@hidden>
 
        * mail/rmail.el (rmail-set-header-1): Ignore case.

=== modified file 'lisp/epg.el'
--- a/lisp/epg.el       2013-01-02 16:13:04 +0000
+++ b/lisp/epg.el       2013-01-03 23:56:51 +0000
@@ -1167,9 +1167,11 @@
     ;; 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)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]