Backporting bug corrections from trunk.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 66fa2b91a09440c1ba865c703c8212a6404f035b..2c22c70f50111aeed5aa3ee635bf68ad0e112c1b 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,8 +1,18 @@
+2007-11-15  Francesco Potort\e,Al\e(B  <pot@gnu.org>
+
+       * etags.c: (C_entries): In case '}' decrement bracelev before testing it.
+
 2007-11-15  Masatake YAMATO  <jet@gyve.org>
 
        * etags.c (C_entries): In case '}', set fvdef to fvnone
        unconditioned to (!ignoreindent && lp == newlb.buffer + 1).
 
+2007-11-15  Francesco Potort\e,Al\e(B  <pot@gnu.org>
+
+       * etags.c: (C_entries): Reset the fvdef machine when out of function.
+       (C_entries): Parse start of C comment as a space == end of token.
+       This is not necessary for C++ comment, already parsed as newline.
+
 2007-10-26  Juanma Barranquero  <lekktu@gmail.com>
 
        * emacsclient.c: Add a wrapper for getenv so it also checks the