CC Mode: stop distinguishing brace blocks from defun blocks by content.
commit36edb6cb97ce3d53543c87643077d270bb5bdfd1
authorAlan Mackenzie <acm@muc.de>
Thu, 18 Jan 2018 17:54:02 +0000 (18 17:54 +0000)
committerAlan Mackenzie <acm@muc.de>
Thu, 18 Jan 2018 17:54:02 +0000 (18 17:54 +0000)
tree541f23713a316f4058d984ac70e537825c171319
parent779b2ac48423ae72a8cb5cd789a2a25302d857d9
CC Mode: stop distinguishing brace blocks from defun blocks by content.

Don't merge to master; this is a quick fix for the emacs-26 branch.  This is
essentially a reversion of the patch from 2017-11-10 which attempted to handle
C99's compound literals.

The bug here was triggered when a defun block contained a declaration ending
in a comma, yet without a semicolon.

* lisp/progmodes/cc-engine.el (c-guess-basic-syntax): At the CASE 9 test,
remove from the `or' form the test of a block's contents.
lisp/progmodes/cc-engine.el