From 4f621b4bec66bd442966bbcf8d3b02a655c33555 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 27 Mar 2015 09:36:22 +1100
Subject: Bug [#1642] Reverting change set 5455 which caused problems with
 highlighting of braces within strings.

---
 doc/ScintillaHistory.html | 4 ++++
 lexers/LexTCL.cxx         | 7 ++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index b9be4596e..e96ac73f4 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -492,6 +492,10 @@
 	and SCI_GETKEYSUNICODE always returns true. These APIs are deprecated and should not be called.
 	</li>
 	<li>
+	TCL lexer reverts change to string handling.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1642/">Bug #1642</a>.
+	</li>
+	<li>
 	Verilog lexer fixes bugs with macro styling.
 	Verilog folder fixes bugs with `end completing an `if* instead of `endif and fold.at.else, and implements
 	folding at preprocessor `else.
diff --git a/lexers/LexTCL.cxx b/lexers/LexTCL.cxx
index 17414e7df..dfcab54ea 100644
--- a/lexers/LexTCL.cxx
+++ b/lexers/LexTCL.cxx
@@ -257,7 +257,7 @@ next:
 				sc.ForwardSetState(SCE_TCL_DEFAULT);
 				visibleChars = true; // necessary if a " is the first and only character on a line
 				goto next;
-			} else if (sc.ch == '[' || sc.ch == ']' || sc.ch == '$' || sc.ch == '(') {
+			} else if (sc.ch == '[' || sc.ch == ']' || sc.ch == '$') {
 				sc.SetState(SCE_TCL_OPERATOR);
 				expected = sc.ch == '[';
 				sc.ForwardSetState(SCE_TCL_IN_QUOTE);
@@ -324,10 +324,7 @@ next:
 					break;
 				case '$':
 					subParen = 0;
-					if (sc.chNext == '(') {
-						//$("") jquery selector?!
-						sc.SetState(SCE_TCL_OPERATOR);
-					} else if (sc.chNext != '{') {
+					if (sc.chNext != '{') {
 						sc.SetState(SCE_TCL_SUBSTITUTION);
 					} else {
 						sc.SetState(SCE_TCL_OPERATOR);  // $
-- 
cgit v1.2.3