Subject: bug#1154 closed by Dan Nicolaescu <[email-masked]> (Re: bug#1154: C-x 4 a in struct [] diff does not work anymore)

From: [email-masked] (Emacs bug Tracking System)

This is an automatic notification regarding your bug report
which was filed against the emacs,cc-mode package:

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

It has been closed by Dan Nicolaescu <[email-masked]>.

Their explanation is attached below along with your original report.
If this explanation is unsatisfactory and you have not received a
better one in a separate message then please contact Dan Nicolaescu <[email-masked]> by
replying to this email.

-- 
1154: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=1154
Emacs Bug Tracking System
Contact [email-masked] with problems
>From [email-masked] Sat Oct 18 00:53:40 2008
Date: Sat, 18 Oct 2008 00:53:25 -0700 (PDT)
From: Dan Nicolaescu <[email-masked]>
To: Alan Mackenzie <[email-masked]>
Cc: [email-masked]
Subject: Re: bug#1154: C-x 4 a in struct [] diff does not work anymore
Lines: 58

Alan Mackenzie <[email-masked]> writes:

  > Hi, Dan:
  > 
  > I've just commited a fix to ..../lisp/progmodes/cc-cmds.el which fixes
  > the first bug (longopts).
  > 
  > I can't reproduce the second bug (C-x 4 a can't find the name for the
  > second hunk).  Could you let me know whether or not it's still a
  > problem.  Thanks!

All the issues seem fixed.  Closing the bug.

Thanks!

  > On Sun, Oct 12, 2008 at 07:38:56PM -0700, Dan Nicolaescu wrote:
  > > 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
  > > 
  > 
  > -- 
  > Alan Mackenzie (Nuremberg, Germany).

>From [email-masked] Sun Oct 12 19:39:16 2008
Date: Sun, 12 Oct 2008 19:38:56 -0700 (PDT)
From: Dan Nicolaescu <[email-masked]>
To: [email-masked]
Subject: C-x 4 a in struct [] diff does not work anymore
Lines: 36

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