* emacsclient.c (decode_options): Don't use a tty on windows.

* makefile.w32-in (VERSION): Update.

diff --git a/lib-src/ChangeLog.multi-tty b/lib-src/ChangeLog.multi-tty
index 9d7126d1e4a2a2f1da44b8bc39672638dd0f202e..f2aafdadb7a2e972745d22a4e793c4ae494fd940 100644 (file)
--- a/lib-src/ChangeLog.multi-tty
+++ b/lib-src/ChangeLog.multi-tty
@@ -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 --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 44d5783dd8820371ce259d96bcbbb142eb1cd7cb..c00ae9d42be55105fb93732060362b1bea8c4278 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -458,9 +458,11 @@ decode_options (argc, argv)
 
   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 --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 953fa7ae6bee158bd812dcaba46f60c246be24e4..345593cb126f0749acabb3e7b1636e51f5d9f9aa 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -24,7 +24,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 .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 \