diff options
| author |  mitchell <70453897+667e-11@users.noreply.github.com> | 2019-03-09 17:16:11 -0500 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2019-03-09 17:16:11 -0500 |
| commit | 7b33eb75991ef90677e723dfc8e11e665c301cd9 (patch) | |
| tree | e8e9913c0ca49ff5408a0f8785d7468619842ef8 /src | |
| parent | b7ac8de4037db46f032f59330938dacc20e60e32 (diff) | |
Updated to Scintilla 3.10.3.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/scintilla.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 20a9cf37..bf6c4091 100644 --- a/src/Makefile +++ b/src/Makefile @@ -364,7 +364,7 @@ else gtdialog_url = http://foicica.com/hg/gtdialog/archive/tip.zip endif -scintilla_zip = 8b888bf05fe3.zip +scintilla_zip = 8fa03651144f.zip lua_tgz = lua-5.3.5.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 6aa2b251..f9f1a294 100644 --- a/src/scintilla.patch +++ b/src/scintilla.patch @@ -26,7 +26,7 @@ Revert caret block placement change introduced by Scintilla 3.7.3. for (size_t r = 0; (r<model.sel.Count()) || drawDrag; r++) { const bool mainCaret = r == model.sel.Main(); - SelectionPosition posCaret = (drawDrag ? model.posDrag : model.sel.Range(r).caret); -- if (vsDraw.caretStyle == CARETSTYLE_BLOCK && !drawDrag && posCaret > model.sel.Range(r).anchor) { +- if ((vsDraw.IsBlockCaretStyle() || imeCaretBlockOverride) && !drawDrag && posCaret > model.sel.Range(r).anchor) { - if (posCaret.VirtualSpace() > 0) - posCaret.SetVirtualSpace(posCaret.VirtualSpace() - 1); - else |