diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-06-27 21:42:16 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-06-27 21:42:16 +0100 |
| commit | 0eedb5af0b9f505dda9418323c74e992a40e5585 (patch) | |
| tree | 9ef1315ecb577c36b062e8b3cb7a7c1bed6fd426 /lisp/progmodes/cc-langs.el | |
| parent | 24f68d6bfc83b5514d928853ffd86b97c53e1623 (diff) | |
| parent | 118c07e02e939c9f52688091509d4bff2a897032 (diff) | |
| download | emacs-0eedb5af0b9f505dda9418323c74e992a40e5585.tar.gz emacs-0eedb5af0b9f505dda9418323c74e992a40e5585.tar.bz2 emacs-0eedb5af0b9f505dda9418323c74e992a40e5585.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/progmodes/cc-langs.el')
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 3ac4aad90b8..00babf95332 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -2787,7 +2787,7 @@ Keywords here should also be in `c-block-stmt-1-kwds'." java '("for" "if" "switch" "while" "catch" "synchronized") idl nil pike '("for" "if" "switch" "while" "foreach") - awk '("for" "if" "while")) + awk '("for" "if" "switch" "while")) (c-lang-defconst c-block-stmt-2-key ;; Regexp matching the start of any statement followed by a paren sexp @@ -2867,8 +2867,7 @@ nevertheless contains a list separated with `;' and not `,'." (c-lang-defconst c-case-kwds "The keyword(s) which introduce a \"case\" like construct. This construct is \"<keyword> <expression> :\"." - t '("case") - awk nil) + t '("case")) (c-lang-defconst c-case-kwds-regexp ;; Adorned regexp matching any "case"-like keyword. |