diff options
| author | Philip Kaludercic <philipk@posteo.net> | 2022-10-15 17:38:30 +0200 |
|---|---|---|
| committer | Philip Kaludercic <philipk@posteo.net> | 2022-10-15 17:38:30 +0200 |
| commit | 01e45efcd44e92dd259283df0e62653c7c20e9cc (patch) | |
| tree | 552c1a6ce7d52b897cf5f089d6c589921efbe9bd /lisp/progmodes/cc-langs.el | |
| parent | 982c0e6c15535defcf6ac3c4d4169708c60efc18 (diff) | |
| parent | 5933055a3e7387b0095f0df7876a208ab15f4f45 (diff) | |
| download | emacs-01e45efcd44e92dd259283df0e62653c7c20e9cc.tar.gz emacs-01e45efcd44e92dd259283df0e62653c7c20e9cc.tar.bz2 emacs-01e45efcd44e92dd259283df0e62653c7c20e9cc.zip | |
Merge branch 'master' into feature/package+vc
Diffstat (limited to 'lisp/progmodes/cc-langs.el')
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index cd23483a58f..b17718cfd54 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -93,7 +93,7 @@ ;; definitions (i.e. this file and/or cc-fonts.el) if necessary. ;; ;; A small example of a derived mode is available at -;; <http://cc-mode.sourceforge.net/derived-mode-ex.el>. It also +;; <https://cc-mode.sourceforge.net/derived-mode-ex.el>. It also ;; contains some useful hints for derived mode developers. ;;; Using language variables: @@ -1449,8 +1449,7 @@ form\". See also `c-op-identifier-prefix'." "??'=" "xor_eq" "&=" "and_eq" "|=" "??!=" "or_eq" "<<" ">>" ">>=" "<<=" "==" "!=" "not_eq" "<=>" "<=" ">=" "&&" "and" "||" "??!??!" "or" "++" "--" "," "->*" "->" - "()" "[]" "<::>" "??(??)") - ;; These work like identifiers in Pike. + "()" "[]" "\"\"" "<::>" "??(??)") pike '("`+" "`-" "`&" "`|" "`^" "`<<" "`>>" "`*" "`/" "`%" "`~" "`==" "`<" "`>" "`!" "`[]" "`[]=" "`->" "`->=" "`()" "``+" "``-" "``&" "``|" "``^" "``<<" "``>>" "``*" "``/" "``%" @@ -2936,6 +2935,15 @@ regexp if `c-colon-type-list-kwds' isn't nil." "[^][{}();,/#=:]*:"))) (c-lang-defvar c-colon-type-list-re (c-lang-const c-colon-type-list-re)) +(c-lang-defconst c-sub-colon-type-list-re + "Regexp matching buffer content that may come between a keyword in +`c-colon-type-list-kwds' and a putative colon, or nil if there are no +such keywords. Exception: it does not match any C++ attributes." + t (if (c-lang-const c-colon-type-list-re) + (substring (c-lang-const c-colon-type-list-re) 0 -1))) +(c-lang-defvar c-sub-colon-type-list-re + (c-lang-const c-sub-colon-type-list-re)) + (c-lang-defconst c-paren-nontype-kwds "Keywords that may be followed by a parenthesis expression that doesn't contain type identifiers." |