From 9c85d2ca1e434e27de5dda7b769b4b78bc8468a0 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Fri, 17 Jun 2011 09:51:49 +1000
Subject: Single quoted strings may not have \ escapes. Bugs #948757 #1755950
 #1888738 #3316852 From Jaime Gimeno

---
 doc/ScintillaHistory.html |  2 ++
 lexers/LexMatlab.cxx      | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 5b0b0d5f8..ce834a7fe 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -375,6 +375,8 @@
 	<td>Elizabeth A. Irizarry</td>
 	<td>Mike Schroeder</td>
 	<td>Morten MacFly</td>
+      </tr><tr>
+	<td>Jaime Gimeno</td>
     </tr>
     </table>
     <p>
diff --git a/lexers/LexMatlab.cxx b/lexers/LexMatlab.cxx
index 0d2064e84..68915af0e 100644
--- a/lexers/LexMatlab.cxx
+++ b/lexers/LexMatlab.cxx
@@ -106,12 +106,12 @@ static void ColouriseMatlabOctaveDoc(
 				transpose = true;
 			}
 		} else if (sc.state == SCE_MATLAB_STRING) {
-			if (sc.ch == '\\') {
-				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
-					sc.Forward();
-				}
-			} else if (sc.ch == '\'') {
-				sc.ForwardSetState(SCE_MATLAB_DEFAULT);
+			if (sc.ch == '\'') {
+				if (sc.chNext == '\'') {
+ 					sc.Forward();
+				} else {
+					sc.ForwardSetState(SCE_MATLAB_DEFAULT);
+ 				}
 			}
 		} else if (sc.state == SCE_MATLAB_DOUBLEQUOTESTRING) {
 			if (sc.ch == '\\') {
-- 
cgit v1.2.3