From: Glenn Morris <rgm@gnu.org>
Date: Thu, 18 Jan 2018 22:02:32 +0000 (-0800)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~5854
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=224fc14ab8354a6b47bb15ec1c825edb71bc2500;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

36edb6c CC Mode: stop distinguishing brace blocks from defun blocks b...
---

224fc14ab8354a6b47bb15ec1c825edb71bc2500