aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJustin Clift <unknown>2017-08-18 09:09:25 +1000
committerJustin Clift <unknown>2017-08-18 09:09:25 +1000
commit2f858e5bcc94b2501729168ac1a49d34d17cb4ef (patch)
tree81c02b5b7248932f6d0f0b08ddb6d9660c78c799
parent29b7ceb1d8e19998b474ac1954a52e1e8f8444ee (diff)
downloadscintilla-mirror-2f858e5bcc94b2501729168ac1a49d34d17cb4ef.tar.gz
Bug [#1968]. Use sql.backslash.escapes for double quoted strings.
-rw-r--r--doc/ScintillaHistory.html14
-rw-r--r--lexers/LexSQL.cxx2
2 files changed, 15 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 6b3dfd681..cdf7d42c5 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -511,6 +511,8 @@
<td>Thorsten Kani</td>
<td>Bernhard M. Wiedemann</td>
<td>Baldur Karlsson</td>
+ </tr><tr>
+ <td>Justin Clift</td>
</tr>
</table>
<p>
@@ -523,6 +525,18 @@
</li>
</ul>
<h3>
+ <a href="http://www.scintilla.org/scite401.zip">Release 4.0.1</a>
+ </h3>
+ <ul>
+ <li>
+ Released 16 August 2017.
+ </li>
+ <li>
+ The SQL lexer uses sql.backslash.escapes for double quoted strings.
+ <a href="http://sourceforge.net/p/scintilla/bugs/1968/">Bug #1968</a>.
+ </li>
+ </ul>
+ <h3>
<a href="http://www.scintilla.org/scite400.zip">Release 4.0.0</a>
</h3>
<ul>
diff --git a/lexers/LexSQL.cxx b/lexers/LexSQL.cxx
index 635e3efe0..447cc20f3 100644
--- a/lexers/LexSQL.cxx
+++ b/lexers/LexSQL.cxx
@@ -547,7 +547,7 @@ void SCI_METHOD LexerSQL::Lex(Sci_PositionU startPos, Sci_Position length, int i
}
break;
case SCE_SQL_STRING:
- if (sc.ch == '\\') {
+ if (options.sqlBackslashEscapes && sc.ch == '\\') {
// Escape sequence
sc.Forward();
} else if (sc.ch == '\"') {