diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2018-05-11 11:51:23 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-05-11 11:51:23 -0400 |
| commit | 15561dbeb97994eba2505023fae5ef144ae8d6b8 (patch) | |
| tree | bcbbf568c26f986ad5505c55b92e0e35b03751af /src/scintilla.patch | |
| parent | 72d2f37c9aba1d6952a932bb1377f6b8daff0838 (diff) | |
| download | textadept-15561dbeb97994eba2505023fae5ef144ae8d6b8.tar.gz textadept-15561dbeb97994eba2505023fae5ef144ae8d6b8.zip | |
Fixed crash on Mac OSX with regex searches.
Diffstat (limited to 'src/scintilla.patch')
| -rw-r--r-- | src/scintilla.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/scintilla.patch b/src/scintilla.patch index c25bbd92..5d38187e 100644 --- a/src/scintilla.patch +++ b/src/scintilla.patch @@ -36,3 +36,15 @@ 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 |