diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-05-16 23:16:53 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-05-16 23:16:53 +0000 |
| commit | 1d00cfd429f75ba241bf833b837dde3de2431620 (patch) | |
| tree | 41b316ce7cb8bb0bec698fdaa10ef7e3fb694c91 /lib-src | |
| parent | 622eee5b948b8fb828455af1430b68a8a089be10 (diff) | |
| download | emacs-1d00cfd429f75ba241bf833b837dde3de2431620.tar.gz | |
* emacsclient.c (decode_options): Don't use a tty on windows.
* makefile.w32-in (VERSION): Update.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog.multi-tty | 5 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 4 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 2 |
3 files changed, 9 insertions, 2 deletions
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 <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 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 \ |