; Merge from origin/emacs-26
commit224fc14ab8354a6b47bb15ec1c825edb71bc2500
authorGlenn Morris <rgm@gnu.org>
Thu, 18 Jan 2018 22:02:32 +0000 (18 14:02 -0800)
committerGlenn Morris <rgm@gnu.org>
Fri, 19 Jan 2018 01:17:06 +0000 (18 17:17 -0800)
treedbf11f1ca48e90903c8aef55183e1446fe218a0e
parentd5b70d8330b35d5a344d57dc98029c2786c10ce3
parent36edb6cb97ce3d53543c87643077d270bb5bdfd1
; Merge from origin/emacs-26

The following commit was skipped:

36edb6c CC Mode: stop distinguishing brace blocks from defun blocks b...
lisp/progmodes/cc-engine.el