(terminal-id): Ask terminal-live-p before giving up.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9b13c2e9ffd7f5bd9f52bc06e73b231a566a17c..0b728f43456a27dcd4fdc9c392adb2e929e74fd4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/termdev.el b/lisp/termdev.el
index 8d631f5ff25f6d2a9a12871ee9ecdaa7a1295765..679b88d1b9f86b4c9098087f2ac120162f73275e 100644 (file)
--- a/lisp/termdev.el
+++ b/lisp/termdev.el
@@ -45,6 +45,7 @@ device (HOST.SERVER.SCREEN) or a tty device file."
                                             (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 @@ device (HOST.SERVER.SCREEN) or a tty device file."
 
 (provide 'termdev)
 
-;;; arch-tag: 4c4df277-1ec1-4f56-bfde-7f156fe62fb2
+;; arch-tag: 4c4df277-1ec1-4f56-bfde-7f156fe62fb2
 ;;; termdev.el ends here