A mistake?

A mistake?

[David Kastrup]

I see the following commit to the multi-tty branch which I had thought
merged and dead.  Should it be committed to some other branch instead?

commit 653c62647bcb7bff47374709f522d64809c0e369
Author: Francesco Potorti` <pot@gnu.org>
Date:   Thu Nov 15 13:47:05 2007 +0000

    etags.c: (C_entries): In case '}', set fvdef to fvnone
    unconditioned to (!ignoreindent && lp == newlb.buffer + 1).

diff --git a/lib-src/etags.c b/lib-src/etags.c
index 0412137..0edc281 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -4006,9 +4006,9 @@ C_entries (c_ext, inf)
 		  bracelev = 0;
 		  token.valid = FALSE; /* something gone amiss, token unreliable */
 		}
-	      if (bracelev == 0 && fvdef == vignore)
-		fvdef = fvnone;		/* end of function */
 	    }
+	  if (bracelev == 0 && fvdef == vignore)
+	    fvdef = fvnone;		/* end of function */
 	  popclass_above (bracelev);
 	  structdef = snone;
 	  /* Only if typdef == tinbody is typdefbracelev significant. */


-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum

Re: A mistake?

[Francesco Potorti`]

>I see the following commit to the multi-tty branch which I had thought
>merged and dead.  Should it be committed to some other branch instead?

I suppose so, thank you for noticing.

I meant to commit to both the trunk and the emacs_22 branch.  Can you
please explain what is the simple way to do that from inside Emacs?

Re: A mistake?

[David Kastrup]

Francesco Potorti` <pot@gnu.org> writes:

>>I see the following commit to the multi-tty branch which I had thought
>>merged and dead.  Should it be committed to some other branch instead?
>
> I suppose so, thank you for noticing.
>
> I meant to commit to both the trunk and the emacs_22 branch.  Can you
> please explain what is the simple way to do that from inside Emacs?

Commit to the emacs_22 branch and wait for Miles to merge it to the
trunk.  Presumably you'd do something like

cvs checkout EMACS_22_BASE .

or what it was called, from the top directory, and then edit and commit
in the resulting tree.

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum

Re: A mistake?

[Francesco Potorti`]

>Commit to the emacs_22 branch and wait for Miles to merge it to the
>trunk.  Presumably you'd do something like
>
>cvs checkout EMACS_22_BASE .
>
>or what it was called, from the top directory, and then edit and commit
>in the resulting tree.

Done, thank you.  I backported bug corrections for etags to the emacs 22
branch.

The trunk additionally uses the same defaults for ctags as for etags:
        (main): Use the same defaults for ctags as for etags: find
        typedefs, structure tags, macro constants, enum constants,
        struct members and global variables.

Does anyone have anything against this change being backported to the
emacs 22 branch as well?

Re: A mistake?

[Richard Stallman]

    The trunk additionally uses the same defaults for ctags as for etags:
	    (main): Use the same defaults for ctags as for etags: find
	    typedefs, structure tags, macro constants, enum constants,
	    struct members and global variables.

    Does anyone have anything against this change being backported to the
    emacs 22 branch as well?

Please don't.  We hope to start pretest of Emacs 22.2 soon,
and this is not a bug fix.