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

[Eli Zaretskii]

branch: emacs-30
commit 285325993580ad9c185d4b0e9b7a6a2703c91092
Merge: 5d2a115ab03 921d40759e5
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/emacs into emacs-30
---
 lisp/progmodes/cc-langs.el | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 233d23492b6..72cfdfa8653 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -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))