summaryrefslogtreecommitdiff
path: root/lib-src/emacsclient.c
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2011-07-02 23:07:57 +0800
committerJason Rumney <jasonr@gnu.org>2011-07-02 23:07:57 +0800
commitbc92abd2821900e25d972503f1a7d95d259d3bfa (patch)
tree5f078c99c985cd0af9611fe6b45af6ea287189ed /lib-src/emacsclient.c
parent7b3747f94c02ea17912b8872e0d468cbc760a9fe (diff)
downloademacs-bc92abd2821900e25d972503f1a7d95d259d3bfa.tar.gz
* lib-src/emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on
Windows. Fixes: debbugs:5486
Diffstat (limited to 'lib-src/emacsclient.c')
-rw-r--r--lib-src/emacsclient.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index c78a42bffe8..2af139aee6d 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -652,6 +652,14 @@ decode_options (int argc, char **argv)
an empty string");
exit (EXIT_FAILURE);
}
+
+ /* TTY frames not supported on Windows. Continue using GUI rather than
+ forcing the user to change their command-line. This is required since
+ tty is set above if certain options are given and $DISPLAY is not set,
+ which is not obvious to users. */
+ if (tty)
+ tty = 0;
+
#endif /* WINDOWSNT */
}