diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2018-06-12 11:29:45 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-06-12 11:29:45 -0400 |
| commit | b3a2fbb09dc1922a96e9f12c6f7887e4f2b57528 (patch) | |
| tree | 2efa8b8e903914404459ade0f525e4cd25be78f4 /src | |
| parent | 9f4d23892343ccf9feba46b7d7d45a0629497e7c (diff) | |
| download | textadept-b3a2fbb09dc1922a96e9f12c6f7887e4f2b57528.tar.gz textadept-b3a2fbb09dc1922a96e9f12c6f7887e4f2b57528.zip | |
Fixed child lexers that embed themselves into parents and fixed proxy lexers.
Also removed temporary Scintilla patch that has been applied.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/scintilla.patch | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/Makefile b/src/Makefile index 962a4676..e5d09e60 100644 --- a/src/Makefile +++ b/src/Makefile @@ -367,7 +367,7 @@ else lspawn_url = http://foicica.com/hg/lspawn/archive/tip.zip endif -scintilla_zip = b4eec2ff1794.zip +scintilla_zip = d5c585411cc5.zip lua_tgz = lua-5.3.4.tar.gz lpeg_tgz = lpeg-1.0.0.tar.gz lfs_zip = v_1_6_3.zip diff --git a/src/scintilla.patch b/src/scintilla.patch index 5d38187e..c25bbd92 100644 --- a/src/scintilla.patch +++ b/src/scintilla.patch @@ -36,15 +36,3 @@ Revert caret block placement change introduced by Scintilla 3.7.3. const int offset = static_cast<int>(posCaret.Position() - posLineStart); const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth; const XYPOSITION virtualOffset = posCaret.VirtualSpace() * spaceWidth; -diff -r f9eb9df49b8e src/Document.cxx ---- a/src/Document.cxx Sun May 06 23:46:01 2018 -0400 -+++ b/src/Document.cxx Fri May 11 11:51:01 2018 -0400 -@@ -2951,7 +2951,7 @@ - #endif - ws[outLen] = 0; - std::wregex regexp; --#if defined(__APPLE__) -+#if defined(__APPLE__) && !defined(GTK) - // Using a UTF-8 locale doesn't change to Unicode over a byte buffer so '.' - // is one byte not one character. - // However, on OS X this makes wregex act as Unicode |