2 files changed, 13 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index b7a95fe8043..098ee06c762 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-02  Jason Rumney  <jasonr@gnu.org>
+
+        * emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on
+        Windows (Bug#5486).
+
 2011-06-25  Glenn Morris  <rgm@gnu.org>
 
         * emacsclient.c (decode_options) <opt>: Add `F:'.
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 */
 }