diff options
| author | Justin Clift <unknown> | 2017-08-18 09:09:25 +1000 |
|---|---|---|
| committer | Justin Clift <unknown> | 2017-08-18 09:09:25 +1000 |
| commit | 3c8561247c8edb33cb18d4f70390359363f42849 (patch) | |
| tree | ff751ab8910d8f66c6dadb2d8fba9c1d8f8e4fb0 | |
| parent | fd85128acd04398796dfe583d1dba5003e561f1d (diff) | |
| download | scintilla-mirror-3c8561247c8edb33cb18d4f70390359363f42849.tar.gz | |
Backport: Bug [#1968]. Use sql.backslash.escapes for double quoted strings.
Backport of changeset 6377:ccc04ea8f7fd.
| -rw-r--r-- | doc/ScintillaHistory.html | 6 | ||||
| -rw-r--r-- | lexers/LexSQL.cxx | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 3b867255d..fb59fd490 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> @@ -567,6 +569,10 @@ <a href="http://sourceforge.net/p/scintilla/bugs/1919/">Bug #1919</a>. </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> + <li> Ensure redraw when application changes overtype mode so caret change visible even when not blinking. Notify application with SC_UPDATE_SELECTION when overtype changed - previously sent SC_UPDATE_CONTENT. diff --git a/lexers/LexSQL.cxx b/lexers/LexSQL.cxx index 871f4dce1..c88514359 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 == '\"') { |