From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 7 Oct 2024 18:06:34 +0000 (+0300)
Subject: * lib-src/etags.c (C_entries): Fix assertion violation.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cc8f0cc361594d4137f74a409de0f71b20a6bef4;p=emacs.git

* lib-src/etags.c (C_entries): Fix assertion violation.

(cherry picked from commit ff4de9eff30ade164655354f71e7cbca48135858)
---

diff --git a/lib-src/etags.c b/lib-src/etags.c
index 7f652790261..4c9b954c9a3 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -4266,7 +4266,10 @@ C_entries (int c_ext,		/* extension of C */
 	  /* Only if typdef == tinbody is typdefbracelev significant. */
 	  if (typdef == tinbody && bracelev <= typdefbracelev)
 	    {
-	      assert (bracelev == typdefbracelev);
+	      /* If we forcibly reset bracelevel to zero above, let's
+		 not shoot ourself in the foot and assert that we didn't.  */
+	      if (!(!ignoreindent && lp == newlb.buffer + 1))
+		assert (bracelev == typdefbracelev);
 	      typdef = tend;
 	    }
 	  break;