Subject: C-x 4 a in struct [] diff does not work anymore

From: Dan Nicolaescu <[email-masked]>
Date: Sun, 12 Oct 2008 19:38:56 -0700 (PDT)

For the patch below, with the point on the first + line, C-x 4 a
adds an entry called:

     * emacsclient.c (]):

emacs-22.2 added the correct entry:

     * emacsclient.c (longopts): 

Also, for the second hunk C-x 4 a cannot find the function name.

Index: emacsclient.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/emacsclient.c,v
retrieving revision 1.132
diff -u -3 -p -u -p -r1.132 emacsclient.c
--- emacsclient.c	19 Sep 2008 16:45:12 -0000	1.132
+++ emacsclient.c	13 Oct 2008 01:34:25 -0000
@@ -156,6 +156,7 @@ struct option longopts[] =
   { "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 @@ decode_options (argc, argv)
 
   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