diff options
Diffstat (limited to 'lisp/progmodes/cc-langs.el')
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 7cda5ceaf1d..1a07c4cd699 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -403,7 +403,9 @@ The syntax tables aren't stored directly since they're quite large." table))) (c-lang-defvar c++-template-syntax-table (and (c-lang-const c++-make-template-syntax-table) - (funcall (c-lang-const c++-make-template-syntax-table)))) + ;; The next eval remove a superfluous ' from '(lambda. This + ;; gets rid of compilation warnings. + (funcall (eval (c-lang-const c++-make-template-syntax-table))))) (c-lang-defconst c-make-no-parens-syntax-table ;; A variant of the standard syntax table which is used to find matching @@ -426,7 +428,8 @@ The syntax tables aren't stored directly since they're quite large." table)))) (c-lang-defvar c-no-parens-syntax-table (and (c-lang-const c-make-no-parens-syntax-table) - (funcall (c-lang-const c-make-no-parens-syntax-table)))) + ;; See comment in `c++template-syntax-table' about the next `eval'. + (funcall (eval (c-lang-const c-make-no-parens-syntax-table))))) (c-lang-defconst c-identifier-syntax-modifications "A list that describes the modifications that should be done to the @@ -1430,6 +1433,14 @@ properly." "\\)\\s *")) (c-lang-setvar comment-start-skip (c-lang-const comment-start-skip)) +(c-lang-defconst comment-end-can-be-escaped + "When non-nil, escaped EOLs inside comments are valid. +This works in Emacs >= 25.1." + t nil + (c c++ objc) t) +(c-lang-setvar comment-end-can-be-escaped + (c-lang-const comment-end-can-be-escaped)) + (c-lang-defconst c-syntactic-ws-start ;; Regexp matching any sequence that can start syntactic whitespace. ;; The only uncertain case is '#' when there are cpp directives. |