From 9cc096e3f7deb6f10512e30da3e589eed927fdd5 Mon Sep 17 00:00:00 2001
From: Zufu Liu <unknown>
Date: Sat, 2 Feb 2019 10:26:58 +1100
Subject: Backport: Feature [feature-requests:#1217]. Implement
 CARETSTYLE_BLOCK_ALWAYS.

Backport of changeset 7248:aba09a1c7c63.
---
 doc/ScintillaDoc.html     | 8 +++++---
 doc/ScintillaHistory.html | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index e897060ae..81f2ef551 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -3210,11 +3210,13 @@ struct Sci_TextToFind {
     <p><b id="SCI_SETCARETSTYLE">SCI_SETCARETSTYLE(int caretStyle)</b><br />
      <b id="SCI_GETCARETSTYLE">SCI_GETCARETSTYLE &rarr; int</b><br />
      The style of the caret can be set with <code>SCI_SETCARETSTYLE</code> to be a line caret
-    (CARETSTYLE_LINE=1), a block caret (CARETSTYLE_BLOCK=2) or to not draw at all
-    (CARETSTYLE_INVISIBLE=0). The default value is the line caret (CARETSTYLE_LINE=1).
+    (CARETSTYLE_LINE=1, insert mode), a block caret (CARETSTYLE_BLOCK=2, insert mode),
+    a block caret in both insert and overtype mode (CARETSTYLE_BLOCK_ALWAYS=3) or to not draw at all
+    (CARETSTYLE_INVISIBLE=0, insert mode). The default value for insert mode is the line caret (CARETSTYLE_LINE=1),
+    for overtype mode is the bar caret.
     You can determine the current caret style setting using <code>SCI_GETCARETSTYLE</code>.</p>
 
-    <p>The block character draws most combining and multibyte character sequences successfully,
+    <p>The block caret draws most combining and multibyte character sequences successfully,
     though some fonts like Thai Fonts (and possibly others) can sometimes appear strange when
     the cursor is positioned at these characters, which may result in only drawing a part of the
     cursor character sequence. This is most notable on Windows platforms.</p>
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 70bf1b3f3..6156a68a4 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -554,6 +554,10 @@
 	<a href="https://sourceforge.net/p/scintilla/bugs/1548/">Bug #1548</a>.
 	</li>
  	<li>
+	Block caret in both insert and overtype mode SCI_SETCARETSTYLE(CARETSTYLE_BLOCK_ALWAYS).
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1217/">Feature #1217</a>.
+	</li>
+ 	<li>
 	The C++ lexer, with styling.within.preprocessor on, now interprets "(" in preprocessor "#if("
 	as an operator instead of part of the directive. This improves folding as well which could become
 	unbalanced.
-- 
cgit v1.2.3