Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/emacs into emacs-30

This commit is contained in:
Eli Zaretskii 2024-07-02 14:08:58 +03:00
commit 2853259935

View file

@ -4396,10 +4396,9 @@ a label construct. This catches C++'s inheritance construct \"class foo
(c-lang-defconst c-opt-extra-label-key
"Optional regexp matching labels.
Normally, labels are detected according to `c-nonlabel-token-key',
`c-decl-prefix-re' and `c-nonlabel-decl-prefix-re'. This regexp can
be used if there are additional labels that aren't recognized that
way."
Normally, labels are detected according to `c-nonlabel-token-key' and
`c-decl-prefix-re'. This regexp can be used if there are additional
labels that aren't recognized that way."
t nil
objc (c-make-keywords-re t (c-lang-const c-protection-kwds)))
(c-lang-defvar c-opt-extra-label-key (c-lang-const c-opt-extra-label-key))