branch: master
commit a0b1ecc785bd654156351c4858242deb8fa04986
Merge: c75f330 53bd8b4
Author: Steve Purcell <[email protected]>
Commit: Steve Purcell <[email protected]>
Merge pull request #16 from dgutov/c++-mode
Add cc-mode vars I missed when fixing php-mode
---
mmm-vars.el | 29 ++++++-----------------------
1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/mmm-vars.el b/mmm-vars.el
index 2d5a4c9..6ce964b 100644
--- a/mmm-vars.el
+++ b/mmm-vars.el
@@ -151,7 +151,6 @@
c-after-suffixed-type-decl-key
c-after-suffixed-type-maybe-decl-key
c-any-class-key
- c-any-class-key
c-asm-stmt-kwds
c-assignment-op-regexp
c-backslash-column
@@ -161,28 +160,27 @@
c-block-decls-with-vars
c-block-prefix-charset
c-block-stmt-1-key
- c-block-stmt-1-key
c-block-stmt-1-kwds
c-block-stmt-2-key
- c-block-stmt-2-key
c-block-stmt-2-kwds
c-brace-list-key
c-cast-parens
c-class-key
- c-class-key
c-class-kwds
c-cleanup-list
c-colon-type-list-re
c-comment-only-line-offset
c-comment-prefix-regexp
c-comment-start-regexp
- c-comment-start-regexp
c-cpp-defined-fns
c-current-comment-prefix
c-decl-block-key
- c-decl-block-key
- c-decl-prefix-re
+ c-decl-hangon-key
+ c-decl-prefix-or-start-re
+ c-decl-prefix-re
c-decl-spec-kwds
+ c-decl-start-kwds
+ c-decl-start-re
c-doc-comment-start-regexp
c-expr-kwds
c-file-offsets
@@ -206,13 +204,10 @@
c-keywords
c-keywords-obarray
c-keywords-regexp
- c-keywords-regexp
c-known-type-key
c-label-key
- c-label-key
c-label-kwds
c-label-kwds-regexp
- c-label-kwds-regexp
c-label-minimum-indentation
c-lambda-kwds
c-literal-start-regexp
@@ -225,36 +220,26 @@
c-opt-<>-arglist-start-in-paren
c-opt-<>-sexp-key
c-opt-access-key
- c-opt-access-key
c-opt-asm-stmt-key
- c-opt-asm-stmt-key
c-opt-bitfield-key
- c-opt-bitfield-key
c-opt-block-decls-with-vars-key
c-opt-block-stmt-key
- c-opt-block-stmt-key
c-opt-cpp-prefix
c-opt-cpp-start
c-opt-decl-spec-key
c-opt-friend-key
- c-opt-friend-key
c-opt-identifier-concat-key
c-opt-inexpr-block-key
- c-opt-inexpr-block-key
c-opt-inexpr-brace-list-key
c-opt-inexpr-class-key
- c-opt-inexpr-class-key
c-opt-lambda-key
- c-opt-lambda-key
c-opt-method-key
- c-opt-method-key
c-opt-postfix-decl-spec-key
c-opt-type-component-key
c-opt-type-concat-key
c-opt-type-modifier-key
c-opt-type-suffix-key
c-other-decl-block-key
- c-other-decl-block-key
c-other-decl-block-kwds
c-other-decl-kwds
c-overloadable-operators-regexp
@@ -267,20 +252,17 @@
c-protection-kwds
c-recognize-<>-arglists
c-recognize-knr-p
- c-recognize-knr-p
c-recognize-paren-inits
c-recognize-typeless-decls
c-regular-keywords-regexp
c-simple-stmt-key
c-simple-stmt-kwds
c-special-brace-lists
- c-special-brace-lists
c-specifier-key
c-specifier-kwds
c-stmt-delim-chars
c-stmt-delim-chars-with-comma
c-symbol-key
- c-symbol-key
c-symbol-start
c-syntactic-eol
c-syntactic-ws-end
@@ -289,6 +271,7 @@
c-type-decl-suffix-key
c-type-prefix-key
c-prefix-spec-kwds-re
+ c-typedef-key
comment-end
comment-start
comment-start-skip))
