From a6ba2ab9277496b66f6939766a3470c1f0a84287 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Thu, 3 Nov 2011 21:55:15 +0000 Subject: [PATCH] Add c-nonlabel-token-2-key to cc-langs.el. --- lisp/progmodes/cc-langs.el | 8 ++++++++ 1 file changed, 8 insertions(+) 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." c++ (concat "\\s\(\\|" (c-lang-const c-nonlabel-token-key))) (c-lang-defvar c-nonlabel-token-key (c-lang-const c-nonlabel-token-key)) +(c-lang-defconst c-nonlabel-token-2-key + "Regexp matching things that can't occur two symbols before a colon in +a label construct. This catches C++'s inheritance construct \"class foo +: bar\". Only used if `c-recognize-colon-labels' is set." + t "\\<\\>" ; matches nothing + c++ (c-make-keywords-re t '("class"))) +(c-lang-defvar c-nonlabel-token-2-key (c-lang-const c-nonlabel-token-2-key)) + (c-lang-defconst c-opt-extra-label-key "Optional regexp matching labels. Normally, labels are detected according to `c-nonlabel-token-key', -- 2.11.4.GIT