diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-01-18 14:02:32 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-01-18 17:17:06 -0800 |
| commit | 224fc14ab8354a6b47bb15ec1c825edb71bc2500 (patch) | |
| tree | dbf11f1ca48e90903c8aef55183e1446fe218a0e /lisp | |
| parent | d5b70d8330b35d5a344d57dc98029c2786c10ce3 (diff) | |
| parent | 36edb6cb97ce3d53543c87643077d270bb5bdfd1 (diff) | |
| download | emacs-224fc14ab8354a6b47bb15ec1c825edb71bc2500.tar.gz emacs-224fc14ab8354a6b47bb15ec1c825edb71bc2500.tar.bz2 emacs-224fc14ab8354a6b47bb15ec1c825edb71bc2500.zip | |
; Merge from origin/emacs-26
The following commit was skipped:
36edb6c CC Mode: stop distinguishing brace blocks from defun blocks b...
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 5a0088df500..b5f085b4b3b 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -12563,11 +12563,7 @@ comment at the start of cc-engine.el for more info." (save-excursion (goto-char containing-sexp) (c-looking-at-special-brace-list))) - (c-inside-bracelist-p containing-sexp paren-state t) - (save-excursion - (goto-char containing-sexp) - (and (eq (char-after) ?{) - (not (c-looking-at-statement-block))))))) + (c-inside-bracelist-p containing-sexp paren-state t)))) (cond ;; CASE 9A: In the middle of a special brace list opener. |