diff options
author | Jason Rumney <[email protected]> | 2011-07-02 23:07:57 +0800 |
---|---|---|
committer | Jason Rumney <[email protected]> | 2011-07-02 23:07:57 +0800 |
commit | bc92abd2821900e25d972503f1a7d95d259d3bfa (patch) | |
tree | 5f078c99c985cd0af9611fe6b45af6ea287189ed /lib-src | |
parent | 7b3747f94c02ea17912b8872e0d468cbc760a9fe (diff) |
* lib-src/emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on
Windows.
Fixes: debbugs:5486
Diffstat (limited to 'lib-src')
-rw-r--r-- | lib-src/ChangeLog | 5 | ||||
-rw-r--r-- | lib-src/emacsclient.c | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index b7a95fe804..098ee06c76 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2011-07-02 Jason Rumney <[email protected]> + + * emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on + Windows (Bug#5486). + 2011-06-25 Glenn Morris <[email protected]> * emacsclient.c (decode_options) <opt>: Add `F:'. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index c78a42bffe..2af139aee6 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 */ } |