# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1179357413 0
# Node ID b009fb9581cae1c27b4138218f28632e91b82a22
# Parent  917fada50740df8b38fe09105e8eef691f1e92fa
* emacsclient.c (decode_options): Don't use a tty on windows.
* makefile.w32-in (VERSION): Update.

diff -r 917fada50740 -r b009fb9581ca lib-src/ChangeLog.multi-tty
--- a/lib-src/ChangeLog.multi-tty	Wed May 16 22:49:30 2007 +0000
+++ b/lib-src/ChangeLog.multi-tty	Wed May 16 23:16:53 2007 +0000
@@ -1,3 +1,8 @@
+2007-05-16  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* emacsclient.c (decode_options): Don't use a tty on windows.
+	* makefile.w32-in (VERSION): Update.
+
 2007-05-16  Jason Rumney  <jasonr@gnu.org>
 
 	* emacsclient.c: (emacs_socket): Rename from s.
diff -r 917fada50740 -r b009fb9581ca lib-src/emacsclient.c
--- a/lib-src/emacsclient.c	Wed May 16 22:49:30 2007 +0000
+++ b/lib-src/emacsclient.c	Wed May 16 23:16:53 2007 +0000
@@ -458,9 +458,11 @@
 
   if (!tty && display)
     window_system = 1;
+#ifndef WINDOWSNT
   else
     tty = 1;
-
+#endif
+  
   /* --no-wait implies --current-frame on ttys when there are file
        arguments or expressions given.  */
   if (nowait && tty && argc - optind > 0)
diff -r 917fada50740 -r b009fb9581ca lib-src/makefile.w32-in
--- a/lib-src/makefile.w32-in	Wed May 16 22:49:30 2007 +0000
+++ b/lib-src/makefile.w32-in	Wed May 16 23:16:53 2007 +0000
@@ -24,7 +24,7 @@
 
 .PHONY: $(ALL)
 
-VERSION		= 22.1.50
+VERSION		= 23.0.51
 
 LOCAL_FLAGS	= -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
 		  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \