# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1190322986 0
# Node ID 875f30e5371e04bbe2f049259a76a90a961d2080
# Parent  f7c4da6e6f4727f1a4ec94c106c75691e66c802b
(terminal-id): Ask terminal-live-p before giving up.

diff -r f7c4da6e6f47 -r 875f30e5371e lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Sep 20 21:14:32 2007 +0000
+++ b/lisp/ChangeLog	Thu Sep 20 21:16:26 2007 +0000
@@ -1,3 +1,7 @@
+2007-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* termdev.el (terminal-id): Ask terminal-live-p before giving up.
+
 2007-09-20  Richard Stallman  <rms@gnu.org>
 
 	* newcomment.el (comment-add): If EXTRA, double `comment-add' value.
diff -r f7c4da6e6f47 -r 875f30e5371e lisp/termdev.el
--- a/lisp/termdev.el	Thu Sep 20 21:14:32 2007 +0000
+++ b/lisp/termdev.el	Thu Sep 20 21:16:26 2007 +0000
@@ -45,6 +45,7 @@
 					     (equal (frame-parameter frame 'tty) terminal)))))))
       (or f (error "Display %s does not exist" terminal))
       (frame-terminal f)))
+   ((terminal-live-p terminal) terminal)
    (t
     (error "Invalid argument %s in `terminal-id'" terminal))))
 
@@ -191,5 +192,5 @@
 
 (provide 'termdev)
 
-;;; arch-tag: 4c4df277-1ec1-4f56-bfde-7f156fe62fb2
+;; arch-tag: 4c4df277-1ec1-4f56-bfde-7f156fe62fb2
 ;;; termdev.el ends here