diff options
| author | Joakim Verona | 2011-11-04 13:06:17 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-11-04 13:06:17 +0100 |
| commit | c823c667cd00b9d8036ce06b943f58f3f4efd7d9 (patch) | |
| tree | 44cba3ad000f3f99215f7d742a9dc579516c4fe3 /lisp/progmodes | |
| parent | 19e28bef7fdd7e74084b5ace141e067b491b50fd (diff) | |
| parent | 89bd5ee15acb93aefd403f3c76d1aff57520608b (diff) | |
| download | emacs-c823c667cd00b9d8036ce06b943f58f3f4efd7d9.tar.gz emacs-c823c667cd00b9d8036ce06b943f58f3f4efd7d9.zip | |
upstream
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/cc-langs.el | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 09f8b318378..e1fb69c30c8 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el | |||
| @@ -3012,6 +3012,14 @@ i.e. before \":\". Only used if `c-recognize-colon-labels' is set." | |||
| 3012 | c++ (concat "\\s\(\\|" (c-lang-const c-nonlabel-token-key))) | 3012 | c++ (concat "\\s\(\\|" (c-lang-const c-nonlabel-token-key))) |
| 3013 | (c-lang-defvar c-nonlabel-token-key (c-lang-const c-nonlabel-token-key)) | 3013 | (c-lang-defvar c-nonlabel-token-key (c-lang-const c-nonlabel-token-key)) |
| 3014 | 3014 | ||
| 3015 | (c-lang-defconst c-nonlabel-token-2-key | ||
| 3016 | "Regexp matching things that can't occur two symbols before a colon in | ||
| 3017 | a label construct. This catches C++'s inheritance construct \"class foo | ||
| 3018 | : bar\". Only used if `c-recognize-colon-labels' is set." | ||
| 3019 | t "\\<\\>" ; matches nothing | ||
| 3020 | c++ (c-make-keywords-re t '("class"))) | ||
| 3021 | (c-lang-defvar c-nonlabel-token-2-key (c-lang-const c-nonlabel-token-2-key)) | ||
| 3022 | |||
| 3015 | (c-lang-defconst c-opt-extra-label-key | 3023 | (c-lang-defconst c-opt-extra-label-key |
| 3016 | "Optional regexp matching labels. | 3024 | "Optional regexp matching labels. |
| 3017 | Normally, labels are detected according to `c-nonlabel-token-key', | 3025 | Normally, labels are detected according to `c-nonlabel-token-key', |