diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2018-02-19 15:37:22 -0500 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-02-19 15:37:22 -0500 |
| commit | 2210542d188ebe4b2fead3057f3df2a6787aeb7d (patch) | |
| tree | cd2bee6aa037c953e9e93ea12a3313b0702d082a /src/scintilla_backports | |
| parent | d29a22ebc96120ec90605decf3db5557a99dc75a (diff) | |
| download | textadept-2210542d188ebe4b2fead3057f3df2a6787aeb7d.tar.gz textadept-2210542d188ebe4b2fead3057f3df2a6787aeb7d.zip | |
Hopefully final set of backport fixes to compile on build server.
Diffstat (limited to 'src/scintilla_backports')
| -rw-r--r-- | src/scintilla_backports/6327_95346e626cf8.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scintilla_backports/6327_95346e626cf8.patch b/src/scintilla_backports/6327_95346e626cf8.patch index 2bbd03e4..cea1ff0d 100644 --- a/src/scintilla_backports/6327_95346e626cf8.patch +++ b/src/scintilla_backports/6327_95346e626cf8.patch @@ -989,12 +989,12 @@ diff -r c15f84c11e17 -r 95346e626cf8 src/Editor.cxx @@ -892,10 +902,12 @@ if (moveDir > 0) { // lineDisplay is already line before fold as lines in fold use display line of line after fold - lineDisplay = Sci::Clamp(lineDisplay, 0, cs.LinesDisplayed()); + lineDisplay = Sci::clamp(lineDisplay, 0, cs.LinesDisplayed()); - return SelectionPosition(pdoc->LineStart(cs.DocFromDisplay(lineDisplay))); + return SelectionPosition(static_cast<Sci::Position>( + pdoc->LineStart(cs.DocFromDisplay(lineDisplay)))); } else { - lineDisplay = Sci::Clamp(lineDisplay - 1, 0, cs.LinesDisplayed()); + lineDisplay = Sci::clamp(lineDisplay - 1, 0, cs.LinesDisplayed()); - return SelectionPosition(pdoc->LineEnd(cs.DocFromDisplay(lineDisplay))); + return SelectionPosition(static_cast<Sci::Position>( + pdoc->LineEnd(cs.DocFromDisplay(lineDisplay)))); @@ -1684,8 +1684,8 @@ diff -r c15f84c11e17 -r 95346e626cf8 src/Editor.cxx return pdoc->MovePositionOutsideChar(static_cast<int>(wParam) + 1, 1, true); case SCI_POSITIONRELATIVE: -- return Sci::Clamp(pdoc->GetRelativePosition(static_cast<int>(wParam), static_cast<int>(lParam)), 0, pdoc->Length()); -+ return Sci::Clamp(static_cast<int>(pdoc->GetRelativePosition(static_cast<int>(wParam), static_cast<int>(lParam))), +- return Sci::clamp(pdoc->GetRelativePosition(static_cast<int>(wParam), static_cast<int>(lParam)), 0, pdoc->Length()); ++ return Sci::clamp(static_cast<int>(pdoc->GetRelativePosition(static_cast<int>(wParam), static_cast<int>(lParam))), + 0, static_cast<int>(pdoc->Length())); case SCI_LINESCROLL: |