[Emacs-diffs] /srv/bzr/emacs/trunk r104876: * lib-src/emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on

[Jason Rumney]

------------------------------------------------------------
revno: 104876
fixes bug(s): http://debbugs.gnu.org/5486
committer: Jason Rumney <address@hidden>
branch nick: trunk
timestamp: Sat 2011-07-02 23:07:57 +0800
message:
  * lib-src/emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on
  Windows.
modified:
  lib-src/ChangeLog
  lib-src/emacsclient.c

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2011-06-25 18:13:14 +0000
+++ b/lib-src/ChangeLog 2011-07-02 15:07:57 +0000
@@ -1,3 +1,8 @@
+2011-07-02  Jason Rumney  <address@hidden>
+
+       * emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on
+       Windows (Bug#5486).
+
 2011-06-25  Glenn Morris  <address@hidden>
 
        * emacsclient.c (decode_options) <opt>: Add `F:'.

=== modified file 'lib-src/emacsclient.c'
--- a/lib-src/emacsclient.c     2011-06-25 19:52:34 +0000
+++ b/lib-src/emacsclient.c     2011-07-02 15:07:57 +0000
@@ -652,6 +652,14 @@
 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 */
 }