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.
	Move definition below includes it depends on.
	(SEND_STRING, SEND_QUOTED): Remove obfuscation macros.
	(quote_argument, set_tcp_socket, handle_sigcont, handle_sigtstp):
	(main): Expand removed macros inline.

2007-05-16  Dan Nicolaescu  <dann@ics.uci.edu>

	* emacsclient.c (s): Restore.
	(main): Don't define s here.
	(w32_execvp): Move definition before use.

2007-05-16  Jason Rumney  <jasonr@gnu.org>

	* emacsclient.c (s): Remove.
	(main): Define here instead.
	(main) [WINDOWSNT]: Don't call ttyname.
	Don't recognize -suspend option.
	(main) [NO_SOCKETS_IN_FILE_SYSTEM]: Don't call init_signals.
	(strprefix): Define unconditionally.

;; Local Variables:
;; coding: iso-2022-7bit
;; add-log-time-zone-rule: t
;; End:

    Copyright (C) 2007 Free Software Foundation, Inc.

  This file is part of GNU Emacs.

  GNU Emacs is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2, or (at your option)
  any later version.

  GNU Emacs is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.

  You should have received a copy of the GNU General Public License
  along with GNU Emacs; see the file COPYING.  If not, write to the
  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.

;; arch-tag: 7080ff76-36b5-4471-8135-2813915e91cc