summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2007-09-20 21:16:26 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2007-09-20 21:16:26 +0000
commitc35a54c70a1b11d15968b1d8af3b10281711e909 (patch)
tree41d0a3bdde17149ab898175142e528cbde0cf9c3
parentfe1e84c5cdd00df5599e62a11fc345d179aa35de (diff)
downloademacs-c35a54c70a1b11d15968b1d8af3b10281711e909.tar.gz
(terminal-id): Ask terminal-live-p before giving up.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/termdev.el3
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9b13c2e9ff..0b728f43456 100644
--- 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 8d631f5ff25..679b88d1b9f 100644
--- 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