[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master edcdf64: Java Mode: Handle strings as case labels c
From: |
Alan Mackenzie |
Subject: |
[Emacs-diffs] master edcdf64: Java Mode: Handle strings as case labels correctly. |
Date: |
Sat, 23 Jul 2016 10:47:13 +0000 (UTC) |
branch: master
commit edcdf64960a2ab4e8d9ce4419874e43b6d3ccee4
Author: Alan Mackenzie <address@hidden>
Commit: Alan Mackenzie <address@hidden>
Java Mode: Handle strings as case labels correctly.
This fixes debbugs #23901.
* lisp/progmodes/cc-langs.el (c-nonlabel-token-key): Remove "\"" from the
Java value.
---
lisp/progmodes/cc-langs.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 4d36684..30949f8 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -3253,8 +3253,8 @@ i.e. before \":\". Only used if
`c-recognize-colon-labels' is set."
(append (c-lang-const c-label-kwds)
(c-lang-const c-protection-kwds))
:test 'string-equal)))
- ;; Don't allow string literals, except in AWK. Character constants are OK.
- (c objc java pike idl) (concat "\"\\|"
+ ;; Don't allow string literals, except in AWK and Java. Character constants
are OK.
+ (c objc pike idl) (concat "\"\\|"
(c-lang-const c-nonlabel-token-key))
;; Also check for open parens in C++, to catch member init lists in
;; constructors. We normally allow it so that macros with arguments
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master edcdf64: Java Mode: Handle strings as case labels correctly.,
Alan Mackenzie <=