aboutsummaryrefslogtreecommitdiff
path: root/src/scintilla_backports/6132_6cf19f2bf214.patch
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2018-03-12 18:20:24 -0400
committermitchell <70453897+667e-11@users.noreply.github.com>2018-03-12 18:20:24 -0400
commitec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672 (patch)
tree3e465bb700187ef104363c31525a73a4147c0edb /src/scintilla_backports/6132_6cf19f2bf214.patch
parentf82726891b4cd2f323ce882e5aa6d71227dda887 (diff)
downloadtextadept-ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672.tar.gz
textadept-ec391b6bfe8d87f4fb1bbb2a4e6033eaad9f4672.zip
Start using Scintilla's LongTerm3, which now includes Scintillua and Scinterm.
Since LongTerm3 requires a C++11 compiler, GCC 4.9+ is required. Since C++11 includes regex capability, drop TRE dependency.
Diffstat (limited to 'src/scintilla_backports/6132_6cf19f2bf214.patch')
-rw-r--r--src/scintilla_backports/6132_6cf19f2bf214.patch19
1 files changed, 0 insertions, 19 deletions
diff --git a/src/scintilla_backports/6132_6cf19f2bf214.patch b/src/scintilla_backports/6132_6cf19f2bf214.patch
deleted file mode 100644
index 3ef0f6c7..00000000
--- a/src/scintilla_backports/6132_6cf19f2bf214.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# HG changeset patch
-# User Neil <nyamatongwe@gmail.com>
-# Date 1489631977 -39600
-# Node ID 6cf19f2bf214b1d1dc0ba05412a6659142c772ec
-# Parent a78e38849624fca65cd615da3f976d22db03a48b
-Fix difference between right of line end and left of fold tag.
-
-diff -r a78e38849624 -r 6cf19f2bf214 src/EditView.cxx
---- a/src/EditView.cxx Thu Mar 16 10:16:39 2017 +1100
-+++ b/src/EditView.cxx Thu Mar 16 13:39:37 2017 +1100
-@@ -1087,7 +1087,7 @@
-
- const XYPOSITION spaceWidth = vsDraw.styles[ll->EndLineStyle()].spaceWidth;
- XYPOSITION virtualSpace = model.sel.VirtualSpaceFor(model.pdoc->LineEnd(line)) * spaceWidth;
-- rcSegment.left = xStart + static_cast<XYPOSITION>(ll->positions[ll->numCharsInLine] - subLineStart) + spaceWidth + virtualSpace;
-+ rcSegment.left = xStart + static_cast<XYPOSITION>(ll->positions[ll->numCharsInLine] - subLineStart) + virtualSpace + vsDraw.aveCharWidth;
- rcSegment.right = rcSegment.left + static_cast<XYPOSITION>(widthFoldDisplayText);
-
- ColourOptional background = vsDraw.Background(model.pdoc->GetMark(line), model.caret.active, ll->containsCaret);