diff options
| author | Alan Mackenzie <acm@muc.de> | 2016-06-01 13:31:47 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2016-06-01 13:31:47 +0000 |
| commit | cd66716bafdd08467b84b226e41c34c9dab66aa8 (patch) | |
| tree | bbcc1c511bd56c472a43095dd4a7291bd5531e5e /lisp | |
| parent | d18b846b4e5667b3d8e47940f3b61d4dc0e7df89 (diff) | |
| download | emacs-cd66716bafdd08467b84b226e41c34c9dab66aa8.tar.gz emacs-cd66716bafdd08467b84b226e41c34c9dab66aa8.tar.bz2 emacs-cd66716bafdd08467b84b226e41c34c9dab66aa8.zip | |
Correct fontification and indentation of C++'s "constexpr" expressions
* lisp/progmodes/cc-langs.el (c-type-modifier-kwds): Remove "constexpr".
(c-modifier-kwds): Add "constexpr".
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 6f4d1f16857..18f1cc4374a 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -1794,7 +1794,7 @@ but they don't build a type of themselves. Unlike the keywords on not the type face." t nil c '("const" "restrict" "volatile") - c++ '("const" "constexpr" "noexcept" "volatile" "throw" "final" "override") + c++ '("const" "noexcept" "volatile" "throw" "final" "override") objc '("const" "volatile")) (c-lang-defconst c-opt-type-modifier-key @@ -1996,8 +1996,8 @@ If any of these also are on `c-type-list-kwds', `c-ref-list-kwds', will be handled." t nil (c c++) '("auto" "extern" "inline" "register" "static") - c++ (append '("explicit" "friend" "mutable" "template" "thread_local" - "using" "virtual") + c++ (append '("constexpr" "explicit" "friend" "mutable" "template" + "thread_local" "using" "virtual") (c-lang-const c-modifier-kwds)) objc '("auto" "bycopy" "byref" "extern" "in" "inout" "oneway" "out" "static") ;; FIXME: Some of those below ought to be on `c-other-decl-kwds' instead. |