# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1223865171 0
# Node ID d63a9c87e0acd2627e050a012d6c4f0914430a0b
# Parent  2cae4bd13e6719a0359fcdace504113eafe3a2ac
(longopts, print_help_and_exit): Add -nw.
(decode_options): Use getopt_long_only.

diff -r 2cae4bd13e67 -r d63a9c87e0ac lib-src/ChangeLog
--- a/lib-src/ChangeLog	Mon Oct 13 01:16:49 2008 +0000
+++ b/lib-src/ChangeLog	Mon Oct 13 02:32:51 2008 +0000
@@ -1,3 +1,8 @@
+2008-10-13  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* emacsclient.c (longopts, print_help_and_exit): Add -nw.
+	(decode_options): Use getopt_long_only.
+
 2008-09-30  Eli Zaretskii  <eliz@gnu.org>
 
 	* makefile.w32-in (OTHER_PLATFORM_SUPPORT): Remove ccl.elc and
diff -r 2cae4bd13e67 -r d63a9c87e0ac lib-src/emacsclient.c
--- a/lib-src/emacsclient.c	Mon Oct 13 01:16:49 2008 +0000
+++ b/lib-src/emacsclient.c	Mon Oct 13 02:32:51 2008 +0000
@@ -156,6 +156,7 @@
   { "help",	no_argument,	   NULL, 'H' },
   { "version",	no_argument,	   NULL, 'V' },
   { "tty",	no_argument,       NULL, 't' },
+  { "nw",	no_argument,       NULL, 't' },
   { "create-frame", no_argument,   NULL, 'c' },
   { "alternate-editor", required_argument, NULL, 'a' },
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
@@ -474,7 +475,7 @@
 
   while (1)
     {
-      int opt = getopt_long (argc, argv,
+      int opt = getopt_long_only (argc, argv,
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
 			     "VHnea:s:f:d:tc",
 #else
@@ -601,7 +602,7 @@
 The following OPTIONS are accepted:\n\
 -V, --version		Just print version info and return\n\
 -H, --help    		Print this usage information message\n\
--t, --tty    		Open a new Emacs frame on the current terminal\n\
+-nw, -t, --tty 		Open a new Emacs frame on the current terminal\n\
 -c, --create-frame    	Create a new frame instead of trying to\n\
 			use the current Emacs frame\n\
 -e, --eval    		Evaluate the FILE arguments as ELisp expressions\n\