From: Francesco Potortì <pot@gnu.org>
Date: Tue, 20 Nov 2007 16:17:03 +0000 (+0000)
Subject: Backporting bug corrections from trunk.
X-Git-Tag: emacs-pretest-22.1.90~338
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=61ec9e85144dfb30deb0bc23e1bb825c8f387b58;p=emacs.git

Backporting bug corrections from trunk.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 66fa2b91a09..2c22c70f501 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,8 +1,18 @@
+2007-11-15  Francesco Potort,Al(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,Al(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