From: Dan Nicolaescu Date: Wed, 16 May 2007 23:16:53 +0000 (+0000) Subject: * emacsclient.c (decode_options): Don't use a tty on windows. X-Git-Tag: emacs-pretest-23.0.90~11236^2~102 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1d00cfd429f75ba241bf833b837dde3de2431620;p=emacs.git * 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 9d7126d1e4a..f2aafdadb7a 100644 --- a/lib-src/ChangeLog.multi-tty +++ b/lib-src/ChangeLog.multi-tty @@ -1,3 +1,8 @@ +2007-05-16 Dan Nicolaescu + + * emacsclient.c (decode_options): Don't use a tty on windows. + * makefile.w32-in (VERSION): Update. + 2007-05-16 Jason Rumney * emacsclient.c: (emacs_socket): Rename from s. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 44d5783dd88..c00ae9d42be 100644 --- 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 953fa7ae6be..345593cb126 100644 --- 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 \