diff options
| author | nyamatongwe <devnull@localhost> | 2011-06-17 09:51:49 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2011-06-17 09:51:49 +1000 |
| commit | be0f88393d907476e720a82493c80f7bf5df04b7 (patch) | |
| tree | 66705a699ff33614c2a2c2089625e38bc935f568 | |
| parent | aa3abfd4039ccc546178ea3704d686835e763ebf (diff) | |
| download | scintilla-mirror-be0f88393d907476e720a82493c80f7bf5df04b7.tar.gz | |
Single quoted strings may not have \ escapes. Bugs #948757 #1755950 #1888738 #3316852
From Jaime Gimeno
| -rw-r--r-- | doc/ScintillaHistory.html | 2 | ||||
| -rw-r--r-- | 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 == '\\') { |