Updated caretstyle patch to apply against Scintilla 5.1.2.

orbitalquark · Sep 30, 2021 · c291259 · c291259
1 parent d5a87ae
commit c291259
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,8 @@ characters when drawing wrap symbols, some marker symbols, and call tip arrows.
 
 ## Requirements
 
-* Scinterm currently requires Scintilla 5.1.0 - 5.x.
+* Scinterm currently requires Scintilla 5.1.2 - 5.x.
+* Scinterm 3.1 requires Scintilla 5.1.0 - 5.1.1
 * Scinterm 3.0 requires Scintilla 3.20.0 - 3.21.0.
 * Scinterm 2.0 requires Scintilla 3.20.0 - 3.21.0.
 * Scinterm 1.12 requires Scintilla 3.11.0 - 3.11.2.

diff --git a/patches/02-caretstyle_curses.patch b/patches/02-caretstyle_curses.patch
@@ -111,7 +111,7 @@ diff -r 13067e47a3c3 src/EditView.cxx
 +			InSelection inSelection = hideSelection ? InSelection::inNone : model.sel.CharacterInSelection(iDoc);
 +			if (vsDraw.IsMainCursesCaret(inSelection == InSelection::inMain))
 +				inSelection = characterInCursesSelection(iDoc, model, vsDraw);
- 			const bool inHotspot = (ll->hotspot.Valid()) && ll->hotspot.ContainsCharacter(iDoc);
+ 			const bool inHotspot = model.hotspot.Valid() && model.hotspot.ContainsCharacter(iDoc);
  			ColourRGBA textBack = TextBackground(model, vsDraw, ll, background, inSelection,
  				inHotspot, ll->styles[i], i);
 @@ -2002,7 +2021,9 @@