diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2018-03-21 12:17:23 -0400 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-03-21 12:17:23 -0400 |
| commit | 215797f4739bb151317b0c4eb7899d346a35e3de (patch) | |
| tree | 06571a7d0cacff593c87cd4374f5ed2d4df84652 | |
| parent | 8c15025f84085cdabaa4b93081a5d7f6096be071 (diff) | |
| download | textadept-215797f4739bb151317b0c4eb7899d346a35e3de.tar.gz textadept-215797f4739bb151317b0c4eb7899d346a35e3de.zip | |
Updated Scintilla LongTerm3 branch reference to include many backports from 4.x.
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/scintilla.patch | 17 | ||||
| -rw-r--r-- | src/textadept.c | 2 |
3 files changed, 6 insertions, 15 deletions
diff --git a/src/Makefile b/src/Makefile index d366b9ed..9c8f9885 100644 --- a/src/Makefile +++ b/src/Makefile @@ -401,7 +401,7 @@ else lspawn_url = http://foicica.com/hg/lspawn/archive/tip.zip endif -scintilla_zip = 3dd2baa4e876.zip +scintilla_zip = d9f1d7450ec2.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 64834cc4..c25bbd92 100644 --- a/src/scintilla.patch +++ b/src/scintilla.patch @@ -1,4 +1,4 @@ -diff -r 5693714a8b0b src/Catalogue.cxx +Only link the LPeg lexer. --- a/src/Catalogue.cxx Fri Dec 06 16:19:52 2013 +1100 +++ b/src/Catalogue.cxx Sun Dec 15 21:21:20 2013 -0500 @@ -74,6 +74,7 @@ @@ -18,18 +18,7 @@ diff -r 5693714a8b0b src/Catalogue.cxx return 1; } -diff -r eb69b2b4bb85 gtk/ScintillaGTK.cxx ---- a/gtk/ScintillaGTK.cxx Mon Jan 18 09:02:53 2016 +1100 -+++ b/gtk/ScintillaGTK.cxx Wed Jan 20 00:52:11 2016 -0500 -@@ -3110,7 +3110,7 @@ - // of the signal handlers here (those that currently attached to wDraw - // in Initialise() may require coordinate translation?) - -- object_class->dispose = Dispose; -+ //object_class->dispose = Dispose; - object_class->finalize = Destroy; - #if GTK_CHECK_VERSION(3,0,0) - widget_class->get_preferred_width = GetPreferredWidth; +Revert caret block placement change introduced by Scintilla 3.7.3. --- a/src/EditView.cxx 2017-10-06 14:21:52.634733696 +0200 +++ b/src/EditView.cxx 2017-10-06 15:06:12.449296662 +0200 @@ -1328,13 +1328,7 @@ @@ -44,6 +33,6 @@ diff -r eb69b2b4bb85 gtk/ScintillaGTK.cxx - posCaret.SetPosition(model.pdoc->MovePositionOutsideChar(posCaret.Position()-1, -1)); - } + const SelectionPosition posCaret = (drawDrag ? model.posDrag : model.sel.Range(r).caret); - const int offset = posCaret.Position() - posLineStart; + const int offset = static_cast<int>(posCaret.Position() - posLineStart); const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth; const XYPOSITION virtualOffset = posCaret.VirtualSpace() * spaceWidth; diff --git a/src/textadept.c b/src/textadept.c index 05891890..e077e983 100644 --- a/src/textadept.c +++ b/src/textadept.c @@ -89,6 +89,8 @@ typedef GtkWidget Scintilla; if (pipe && thread) \ TerminateThread(thread, 0), CloseHandle(thread), CloseHandle(pipe); #endif +#elif CURSES +typedef void Scintilla; #endif // Lua definitions and macros. |