summaryrefslogtreecommitdiff
path: root/lib-src/emacsclient.c
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2008-10-30 15:54:38 +0000
committerChong Yidong <cyd@stupidchicken.com>2008-10-30 15:54:38 +0000
commit8536c0f5c5536ed023c61c6f903abbef805f2715 (patch)
treea6606fd51f5ad4da0777833a71e6fe2329c548e4 /lib-src/emacsclient.c
parent8a8a7cd3966150a600689862f5ee6b6a8d2ffe61 (diff)
downloademacs-8536c0f5c5536ed023c61c6f903abbef805f2715.tar.gz
emacs-8536c0f5c5536ed023c61c6f903abbef805f2715.tar.bz2
emacs-8536c0f5c5536ed023c61c6f903abbef805f2715.zip
(main): If using the current frame, send tty information to Emacs in
case daemon mode needs to occupy this tty.
Diffstat (limited to 'lib-src/emacsclient.c')
-rw-r--r--lib-src/emacsclient.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 870100ed4af..0bbc385d07f 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1437,7 +1437,10 @@ main (argc, argv)
send_to_emacs (emacs_socket, " ");
}
- if (tty)
+ /* If using the current frame, send tty information to Emacs anyway.
+ In daemon mode, Emacs may need to occupy this tty if no other
+ frame is available. */
+ if (tty || current_frame)
{
char *type = egetenv ("TERM");
char *tty_name = NULL;