[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 224fc14 4/5: ; Merge from origin/emacs-26
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 224fc14 4/5: ; Merge from origin/emacs-26 |
Date: |
Thu, 18 Jan 2018 20:18:32 -0500 (EST) |
branch: master
commit 224fc14ab8354a6b47bb15ec1c825edb71bc2500
Merge: d5b70d8 36edb6c
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
; 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 | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 5a0088d..b5f085b 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.