Mercurial > emacs
changeset 83607:b009fb9581ca
* emacsclient.c (decode_options): Don't use a tty on windows.
* makefile.w32-in (VERSION): Update.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 16 May 2007 23:16:53 +0000 |
| parents | 917fada50740 |
| children | 2ad761d6b244 |
| files | lib-src/ChangeLog.multi-tty lib-src/emacsclient.c lib-src/makefile.w32-in |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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)
--- 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 \