diff --git a/PowerEditor/scintilla.original.forUpdating/lexilla518.zip b/PowerEditor/scintilla.original.forUpdating/lexilla519.zip
similarity index 80%
rename from PowerEditor/scintilla.original.forUpdating/lexilla518.zip
rename to PowerEditor/scintilla.original.forUpdating/lexilla519.zip
index 271da4562..1c4f8f7ed 100644
Binary files a/PowerEditor/scintilla.original.forUpdating/lexilla518.zip and b/PowerEditor/scintilla.original.forUpdating/lexilla519.zip differ
diff --git a/PowerEditor/scintilla.original.forUpdating/scintilla524.zip b/PowerEditor/scintilla.original.forUpdating/scintilla524.zip
deleted file mode 100644
index 576aba440..000000000
Binary files a/PowerEditor/scintilla.original.forUpdating/scintilla524.zip and /dev/null differ
diff --git a/PowerEditor/scintilla.original.forUpdating/scintilla530.zip b/PowerEditor/scintilla.original.forUpdating/scintilla530.zip
new file mode 100644
index 000000000..d5bf0fe91
Binary files /dev/null and b/PowerEditor/scintilla.original.forUpdating/scintilla530.zip differ
diff --git a/lexilla/.gitattributes b/lexilla/.gitattributes
index 6ab5309d3..135d6b522 100644
--- a/lexilla/.gitattributes
+++ b/lexilla/.gitattributes
@@ -19,6 +19,7 @@
 **.def text
 **.manifest text
 **.properties text
+**.props text
 **.session text
 **.styled text
 **.folded text
diff --git a/lexilla/doc/Lexilla.html b/lexilla/doc/Lexilla.html
index 739e95469..bc42fc49c 100644
--- a/lexilla/doc/Lexilla.html
+++ b/lexilla/doc/Lexilla.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20220710" />
+    <meta name="Date.Modified" content="20220827" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         .logo {
@@ -61,8 +61,8 @@
           <font color="#FFCC99" size="4"> A library of language lexers for use with Scintilla</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3">Release version 5.1.8<br />
-           Site last modified July 10 2022</font>
+          <font color="#FFCC99" size="3">Release version 5.1.9<br />
+           Site last modified August 27 2022</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -77,6 +77,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.1.9 improves Julia and Properties.</li>
       <li>Version 5.1.8 improves F#, MS SQL, PowerShell, and Visual Prolog.</li>
       <li>Version 5.1.7 improves CMake, HTML, Matlab, Raku, Ruby, and VHDL.</li>
       <li>Version 5.1.6 improves Markdown and Ruby.</li>
diff --git a/lexilla/doc/LexillaDownload.html b/lexilla/doc/LexillaDownload.html
index 74b7377f4..cf98aefd6 100644
--- a/lexilla/doc/LexillaDownload.html
+++ b/lexilla/doc/LexillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/lexilla518.zip">
+          <font size="4"> <a href="https://www.scintilla.org/lexilla519.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/lexilla518.tgz">
+	<a href="https://www.scintilla.org/lexilla519.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.1.8
+       Release 5.1.9
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@
        The source code package contains all of the source code for Lexilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/lexilla518.zip">zip format</a> (1.1M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/lexilla518.tgz">tgz format</a> (0.9M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/lexilla519.zip">zip format</a> (1.1M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/lexilla519.tgz">tgz format</a> (0.9M) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/lexilla/doc/LexillaHistory.html b/lexilla/doc/LexillaHistory.html
index 58223da2e..010593884 100644
--- a/lexilla/doc/LexillaHistory.html
+++ b/lexilla/doc/LexillaHistory.html
@@ -580,11 +580,34 @@
 	<td>cdbdev</td>
 	<td>Andrey Smolyakov</td>
 	<td>Knut Leimbert</td>
+      </tr><tr>
+	<td>German Aizek</td>
     </tr>
     </table>
     <h2>Releases</h2>
     <h3>
-       <a href="https://www.scintilla.org/lexilla519.zip">Release 5.1.8</a>
+       <a href="https://www.scintilla.org/lexilla519.zip">Release 5.1.9</a>
+    </h3>
+    <ul>
+	<li>
+	Released 27 August 2022.
+	</li>
+	<li>
+	Julia: Parse unicode forall and exists as identifiers #42314.
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/98">Pull request #98</a>.
+	</li>
+	<li>
+	Julia: Parse apostrophe as char and not adjoint after exclamation.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/97">Issue #97</a>,
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/98">Pull request #98</a>.
+	</li>
+	<li>
+	Properties: Don't set header flag for empty section.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/96">Issue #96</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla518.zip">Release 5.1.8</a>
     </h3>
     <ul>
 	<li>
diff --git a/lexilla/lexers/LexCPP.cxx b/lexilla/lexers/LexCPP.cxx
index 05367ffcf..f08ba4751 100644
--- a/lexilla/lexers/LexCPP.cxx
+++ b/lexilla/lexers/LexCPP.cxx
@@ -263,8 +263,7 @@ class LinePPState {
 		}
 	}
 public:
-	LinePPState() noexcept {
-	}
+	LinePPState() noexcept = default;
 	bool ValidLevel() const noexcept {
 		return level >= 0 && level < maximumNestingLevel;
 	}
@@ -654,7 +653,7 @@ public:
 			if (styleActive < sizeLexicalClasses)
 				returnBuffer += lexicalClasses[styleActive].tags;
 			else
-				returnBuffer = "";
+				returnBuffer.clear();
 			return returnBuffer.c_str();
 		}
 		return "";
@@ -883,7 +882,7 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 			lineCurrent++;
 			lineEndNext = styler.LineEnd(lineCurrent);
 			vlls.Add(lineCurrent, preproc);
-			if (rawStringTerminator != "") {
+			if (!rawStringTerminator.empty()) {
 				rawSTNew.Set(lineCurrent-1, rawStringTerminator);
 			}
 		}
@@ -894,7 +893,7 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 				lineCurrent++;
 				lineEndNext = styler.LineEnd(lineCurrent);
 				vlls.Add(lineCurrent, preproc);
-				if (rawStringTerminator != "") {
+				if (!rawStringTerminator.empty()) {
 					rawSTNew.Set(lineCurrent-1, rawStringTerminator);
 				}
 				sc.Forward();
@@ -1161,7 +1160,7 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 					for (size_t termPos=rawStringTerminator.size(); termPos; termPos--)
 						sc.Forward();
 					sc.SetState(SCE_C_DEFAULT|activitySet);
-					rawStringTerminator = "";
+					rawStringTerminator.clear();
 				}
 				break;
 			case SCE_C_CHARACTER:
@@ -1634,7 +1633,7 @@ void LexerCPP::EvaluateTokens(Tokens &tokens, const SymbolTable &preprocessorDef
 				if (it->second.IsMacro()) {
 					if ((i + 1 < tokens.size()) && (tokens.at(i + 1) == "(")) {
 						// Create map of argument name to value
-						Tokens argumentNames = StringSplit(it->second.arguments, ',');
+						const Tokens argumentNames = StringSplit(it->second.arguments, ',');
 						std::map<std::string, std::string> arguments;
 						size_t arg = 0;
 						size_t tok = i+2;
diff --git a/lexilla/lexers/LexErrorList.cxx b/lexilla/lexers/LexErrorList.cxx
index 24eec8f74..1e7c0776a 100644
--- a/lexilla/lexers/LexErrorList.cxx
+++ b/lexilla/lexers/LexErrorList.cxx
@@ -136,7 +136,7 @@ int RecogniseErrorListLine(const char *lineBuffer, Sci_PositionU lengthLine, Sci
 		// HTML tidy style: line 42 column 1
 		return SCE_ERR_TIDY;
 	} else if (strstart(lineBuffer, "\tat ") &&
-	           strstr(lineBuffer, "(") &&
+	           strchr(lineBuffer, '(') &&
 	           strstr(lineBuffer, ".java:")) {
 		// Java stack back trace
 		return SCE_ERR_JAVA_STACK;
diff --git a/lexilla/lexers/LexJulia.cxx b/lexilla/lexers/LexJulia.cxx
index 7bbbe51ef..a37e428a8 100644
--- a/lexilla/lexers/LexJulia.cxx
+++ b/lexilla/lexers/LexJulia.cxx
@@ -252,9 +252,10 @@ static int is_wc_cat_id_start(uint32_t wc) {
               wc == 0x223f || wc == 0x22be || wc == 0x22bf || // ∿, ⊾, ⊿
               wc == 0x22a4 || wc == 0x22a5 ||   // ⊤ ⊥
 
-              (wc >= 0x2202 && wc <= 0x2233 &&
+              (wc >= 0x2200 && wc <= 0x2233 &&
                (wc == 0x2202 || wc == 0x2205 || wc == 0x2206 || // ∂, ∅, ∆
                 wc == 0x2207 || wc == 0x220e || wc == 0x220f || // ∇, ∎, ∏
+                wc == 0x2200 || wc == 0x2203 || wc == 0x2204 || // ∀, ∃, ∄
                 wc == 0x2210 || wc == 0x2211 || // ∐, ∑
                 wc == 0x221e || wc == 0x221f || // ∞, ∟
                 wc >= 0x222b)) || // ∫, ∬, ∭, ∮, ∯, ∰, ∱, ∲, ∳
@@ -1020,6 +1021,7 @@ void SCI_METHOD LexerJulia::Lex(Sci_PositionU startPos, Sci_Position length, int
                 }
             } else if (sc.ch == '!') {
                 sc.SetState(SCE_JULIA_OPERATOR);
+                transpose = false;
             } else if (sc.ch == '\'') {
                 if (transpose) {
                     sc.SetState(SCE_JULIA_OPERATOR);
diff --git a/lexilla/lexers/LexProps.cxx b/lexilla/lexers/LexProps.cxx
index 7dadb2c6e..700a0ab51 100644
--- a/lexilla/lexers/LexProps.cxx
+++ b/lexilla/lexers/LexProps.cxx
@@ -119,7 +119,7 @@ static void FoldPropsDoc(Sci_PositionU startPos, Sci_Position length, int, WordL
 	char chNext = styler[startPos];
 	int styleNext = styler.StyleAt(startPos);
 	bool headerPoint = false;
-	int lev;
+	int levelPrevious = (lineCurrent > 0) ? styler.LevelAt(lineCurrent - 1) : SC_FOLDLEVELBASE;
 
 	for (Sci_PositionU i = startPos; i < endPos; i++) {
 		const char ch = chNext;
@@ -134,27 +134,19 @@ static void FoldPropsDoc(Sci_PositionU startPos, Sci_Position length, int, WordL
 		}
 
 		if (atEOL) {
-			lev = SC_FOLDLEVELBASE;
-
-			if (lineCurrent > 0) {
-				const int levelPrevious = styler.LevelAt(lineCurrent - 1);
-
-				if (levelPrevious & SC_FOLDLEVELHEADERFLAG) {
-					lev = SC_FOLDLEVELBASE + 1;
-				} else {
-					lev = levelPrevious & SC_FOLDLEVELNUMBERMASK;
-				}
-			}
-
+			int lev = levelPrevious & SC_FOLDLEVELNUMBERMASK;
 			if (headerPoint) {
-				lev = SC_FOLDLEVELBASE;
+				lev = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
+				if (levelPrevious & SC_FOLDLEVELHEADERFLAG) {
+					// previous section is empty
+					styler.SetLevel(lineCurrent - 1, SC_FOLDLEVELBASE);
+				}
+			} else if (levelPrevious & SC_FOLDLEVELHEADERFLAG) {
+				lev += 1;
 			}
+
 			if (visibleChars == 0 && foldCompact)
 				lev |= SC_FOLDLEVELWHITEFLAG;
-
-			if (headerPoint) {
-				lev |= SC_FOLDLEVELHEADERFLAG;
-			}
 			if (lev != styler.LevelAt(lineCurrent)) {
 				styler.SetLevel(lineCurrent, lev);
 			}
@@ -162,23 +154,18 @@ static void FoldPropsDoc(Sci_PositionU startPos, Sci_Position length, int, WordL
 			lineCurrent++;
 			visibleChars = 0;
 			headerPoint = false;
+			levelPrevious = lev;
 		}
 		if (!isspacechar(ch))
 			visibleChars++;
 	}
 
-	if (lineCurrent > 0) {
-		const int levelPrevious = styler.LevelAt(lineCurrent - 1);
-		if (levelPrevious & SC_FOLDLEVELHEADERFLAG) {
-			lev = SC_FOLDLEVELBASE + 1;
-		} else {
-			lev = levelPrevious & SC_FOLDLEVELNUMBERMASK;
-		}
-	} else {
-		lev = SC_FOLDLEVELBASE;
+	int level = levelPrevious & SC_FOLDLEVELNUMBERMASK;
+	if (levelPrevious & SC_FOLDLEVELHEADERFLAG) {
+		level += 1;
 	}
 	int flagsNext = styler.LevelAt(lineCurrent);
-	styler.SetLevel(lineCurrent, lev | (flagsNext & ~SC_FOLDLEVELNUMBERMASK));
+	styler.SetLevel(lineCurrent, level | (flagsNext & ~SC_FOLDLEVELNUMBERMASK));
 }
 
 static const char *const emptyWordListDesc[] = {
diff --git a/lexilla/lexers/LexVisualProlog.cxx b/lexilla/lexers/LexVisualProlog.cxx
index 2fa1ce0e2..8ff6ab8e7 100644
--- a/lexilla/lexers/LexVisualProlog.cxx
+++ b/lexilla/lexers/LexVisualProlog.cxx
@@ -156,12 +156,6 @@ Sci_Position SCI_METHOD LexerVisualProlog::WordListSet(int n, const char *wl) {
     return firstModification;
 }
 
-// Functor used to truncate history
-struct After {
-    Sci_Position line;
-    After(Sci_Position line_) : line(line_) {}
-};
-
 static bool isLowerLetter(int ch){
     return ccLl == CategoriseCharacter(ch);
 }
diff --git a/lexilla/src/Lexilla.vcxproj b/lexilla/src/Lexilla.vcxproj
index 3a853b691..726d461c1 100644
--- a/lexilla/src/Lexilla.vcxproj
+++ b/lexilla/src/Lexilla.vcxproj
@@ -140,6 +140,8 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>MaxSpeed</Optimization>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -152,6 +154,8 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>MaxSpeed</Optimization>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -164,6 +168,8 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>MaxSpeed</Optimization>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/lexilla/src/Lexilla/Info.plist b/lexilla/src/Lexilla/Info.plist
index ef32f3acc..049a78236 100644
--- a/lexilla/src/Lexilla/Info.plist
+++ b/lexilla/src/Lexilla/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.1.8</string>
+	<string>5.1.9</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj b/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
index ec8d3e66a..4fd5fdcca 100644
--- a/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
+++ b/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
@@ -851,7 +851,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5.1.8;
+				CURRENT_PROJECT_VERSION = 5.1.9;
 				DEVELOPMENT_TEAM = 4F446KW87E;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -877,7 +877,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5.1.8;
+				CURRENT_PROJECT_VERSION = 5.1.9;
 				DEVELOPMENT_TEAM = 4F446KW87E;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
diff --git a/lexilla/src/LexillaVersion.rc b/lexilla/src/LexillaVersion.rc
index 6f6d69dd6..2060bef1e 100644
--- a/lexilla/src/LexillaVersion.rc
+++ b/lexilla/src/LexillaVersion.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_LEXILLA "5.1.8"
-#define VERSION_WORDS 5, 1, 8, 0
+#define VERSION_LEXILLA "5.1.9"
+#define VERSION_WORDS 5, 1, 9, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff --git a/lexilla/test/TestLexers.cxx b/lexilla/test/TestLexers.cxx
index 0f312c96e..06fa30605 100644
--- a/lexilla/test/TestLexers.cxx
+++ b/lexilla/test/TestLexers.cxx
@@ -332,10 +332,32 @@ std::vector<std::string> StringSplit(const std::string_view &text, int separator
 	return vs;
 }
 
-static constexpr bool IsSpaceOrTab(char ch) noexcept {
+constexpr bool IsSpaceOrTab(char ch) noexcept {
 	return (ch == ' ') || (ch == '\t');
 }
 
+void PrintRanges(const std::vector<bool> &v) {
+	std::cout << "    ";
+	std::optional<size_t> startRange;
+	for (size_t style = 0; style <= v.size(); style++) {
+		// Goes one past size so that final range is closed
+		if ((style < v.size()) && v.at(style)) {
+			if (!startRange) {
+				startRange = style;
+			}
+		} else if (startRange) {
+			const size_t endRange = style - 1;
+			std::cout << *startRange;
+			if (*startRange != endRange) {
+				std::cout << "-" << endRange;
+			}
+			std::cout << " ";
+			startRange.reset();
+		}
+	}
+	std::cout << "\n";
+}
+
 class PropertyMap {
 
 	std::string Evaluate(std::string_view text) {
@@ -575,6 +597,7 @@ void StyleLineByLine(TestDocument &doc, Scintilla::ILexer5 *plex) {
 }
 
 bool TestCRLF(std::filesystem::path path, const std::string s, Scintilla::ILexer5 *plex, bool disablePerLineTests) {
+	assert(plex);
 	bool success = true;
 	// Convert all line ends to \r\n to check if styles change between \r and \n which makes
 	// it difficult to test on different platforms when files may have line ends changed.
@@ -586,6 +609,7 @@ bool TestCRLF(std::filesystem::path path, const std::string s, Scintilla::ILexer
 	TestDocument doc;
 	doc.Set(text);
 	Scintilla::IDocument *pdoc = &doc;
+	assert(pdoc);
 	plex->Lex(0, pdoc->Length(), 0, pdoc);
 	plex->Fold(0, pdoc->Length(), 0, pdoc);
 	const auto [styledText, foldedText] = MarkedAndFoldedDocument(pdoc);
@@ -613,6 +637,7 @@ bool TestCRLF(std::filesystem::path path, const std::string s, Scintilla::ILexer
 	TestDocument docUnix;
 	docUnix.Set(textUnix);
 	Scintilla::IDocument *pdocUnix = &docUnix;
+	assert(pdocUnix);
 	plex->Lex(0, pdocUnix->Length(), 0, pdocUnix);
 	plex->Fold(0, pdocUnix->Length(), 0, pdocUnix);
 	auto [styledTextUnix, foldedTextUnix] = MarkedAndFoldedDocument(pdocUnix);
@@ -790,6 +815,7 @@ bool TestFile(const std::filesystem::path &path, const PropertyMap &propertyMap)
 	TestDocument doc;
 	doc.Set(text);
 	Scintilla::IDocument *pdoc = &doc;
+	assert(pdoc);
 	for (int i = 0; i < repeatLex; i++) {
 		plex->Lex(0, pdoc->Length(), 0, pdoc);
 	}
@@ -813,13 +839,7 @@ bool TestFile(const std::filesystem::path &path, const PropertyMap &propertyMap)
 			const unsigned style = pdoc->StyleAt(pos);
 			used.at(style) = true;
 		}
-		std::cout << "    ";
-		for (int style = 0; style < 0x80; style++) {
-			if (used.at(style)) {
-				std::cout << style << " ";
-			}
-		}
-		std::cout << "\n";
+		PrintRanges(used);
 	}
 
 	const std::optional<int> perLineDisable = propertyMap.GetPropertyValue("testlexers.per.line.disable");
diff --git a/lexilla/test/examples/cpp/AllStyles.cxx b/lexilla/test/examples/cpp/AllStyles.cxx
new file mode 100644
index 000000000..7d5db581a
--- /dev/null
+++ b/lexilla/test/examples/cpp/AllStyles.cxx
@@ -0,0 +1,175 @@
+// Enumerate all primary styles: 0 to 27 and secondary styles 64 to 91
+
+// default=0
+   
+
+// comment=1
+/* */
+
+/* commentline=2 */
+// example line
+
+// commentdoc=3
+/** */
+
+// number=4
+123
+
+// word=5
+int
+
+// string=6
+"string"
+
+// character=7
+'c'
+
+// uuid=8
+uuid(3fd43029-1354-42f0-a5be-4a484c9c5250)
+
+// preprocessor=9
+#define xxx 1
+
+// operator=10
+{}
+
+// identifier=11
+identifier
+
+// stringeol=12
+"
+
+// verbatim=13
+@"verbatim"
+
+// regex=14
+(/regex/)
+
+// commentlinedoc=15
+/// example
+
+// word2=16
+second
+
+// commentdockeyword=17
+/** @file */
+
+// commentdockeyworderror=18
+/** @wrongkey */
+
+// globalclass=19
+global
+
+// stringraw=20
+R"( )"
+
+// tripleverbatim=21
+""" xx """
+
+// hashquotedstring=22
+#" xx "
+
+// preprocessorcomment=23
+#define /* comment */
+
+// preprocessorcommentdoc=24
+#define /** comment */
+
+// userliteral=25
+1_date_
+
+// taskmarker=26
+/* TODO: sleep */
+
+// escapesequence=27
+"\001 \b"
+
+// Secondary styles inside preprocessor excluded section
+
+#if 0
+
+// default=0
+   
+
+// comment=1
+/* */
+
+/* commentline=2 */
+// example line
+
+// commentdoc=3
+/** */
+
+// number=4
+123
+
+// word=5
+int
+
+// string=6
+"string"
+
+// character=7
+'c'
+
+// uuid=8
+uuid(3fd43029-1354-42f0-a5be-4a484c9c5250)
+
+// preprocessor=9
+#define xxx 1
+
+// operator=10
+{}
+
+// identifier=11
+identifier
+
+// stringeol=12
+"
+
+// verbatim=13
+@"verbatim"
+
+// regex=14
+(/regex/)
+
+// commentlinedoc=15
+/// example
+
+// word2=16
+second
+
+// commentdockeyword=17
+/** @file */
+
+// commentdockeyworderror=18
+/** @wrongkey */
+
+// globalclass=19
+global
+
+// stringraw=20
+R"( )"
+
+// tripleverbatim=21
+""" xx """
+
+// hashquotedstring=22
+#" xx "
+
+// preprocessorcomment=23
+#define /* comment */
+
+// preprocessorcommentdoc=24
+#define /** comment */
+
+// userliteral=25
+1_date_
+
+// taskmarker=26
+/* TODO: sleep */
+
+// escapesequence=27
+"\001 \b"
+
+#endif
diff --git a/lexilla/test/examples/cpp/AllStyles.cxx.folded b/lexilla/test/examples/cpp/AllStyles.cxx.folded
new file mode 100644
index 000000000..ae6ffc49c
--- /dev/null
+++ b/lexilla/test/examples/cpp/AllStyles.cxx.folded
@@ -0,0 +1,176 @@
+ 0 400 400   // Enumerate all primary styles: 0 to 27 and secondary styles 64 to 91
+ 1 400 400   
+ 0 400 400   // default=0
+ 1 400 400      
+ 1 400 400   
+ 0 400 400   // comment=1
+ 0 400 400   /* */
+ 1 400 400   
+ 0 400 400   /* commentline=2 */
+ 0 400 400   // example line
+ 1 400 400   
+ 0 400 400   // commentdoc=3
+ 0 400 400   /** */
+ 1 400 400   
+ 0 400 400   // number=4
+ 0 400 400   123
+ 1 400 400   
+ 0 400 400   // word=5
+ 0 400 400   int
+ 1 400 400   
+ 0 400 400   // string=6
+ 0 400 400   "string"
+ 1 400 400   
+ 0 400 400   // character=7
+ 0 400 400   'c'
+ 1 400 400   
+ 0 400 400   // uuid=8
+ 0 400 400   uuid(3fd43029-1354-42f0-a5be-4a484c9c5250)
+ 1 400 400   
+ 0 400 400   // preprocessor=9
+ 0 400 400   #define xxx 1
+ 1 400 400   
+ 0 400 400   // operator=10
+ 0 400 400   {}
+ 1 400 400   
+ 0 400 400   // identifier=11
+ 0 400 400   identifier
+ 1 400 400   
+ 0 400 400   // stringeol=12
+ 0 400 400   "
+ 1 400 400   
+ 0 400 400   // verbatim=13
+ 0 400 400   @"verbatim"
+ 1 400 400   
+ 0 400 400   // regex=14
+ 0 400 400   (/regex/)
+ 1 400 400   
+ 0 400 400   // commentlinedoc=15
+ 0 400 400   /// example
+ 1 400 400   
+ 0 400 400   // word2=16
+ 0 400 400   second
+ 1 400 400   
+ 0 400 400   // commentdockeyword=17
+ 0 400 400   /** @file */
+ 1 400 400   
+ 0 400 400   // commentdockeyworderror=18
+ 0 400 400   /** @wrongkey */
+ 1 400 400   
+ 0 400 400   // globalclass=19
+ 0 400 400   global
+ 1 400 400   
+ 0 400 400   // stringraw=20
+ 0 400 400   R"( )"
+ 1 400 400   
+ 0 400 400   // tripleverbatim=21
+ 0 400 400   """ xx """
+ 1 400 400   
+ 0 400 400   // hashquotedstring=22
+ 0 400 400   #" xx "
+ 1 400 400   
+ 0 400 400   // preprocessorcomment=23
+ 0 400 400   #define /* comment */
+ 1 400 400   
+ 0 400 400   // preprocessorcommentdoc=24
+ 0 400 400   #define /** comment */
+ 1 400 400   
+ 0 400 400   // userliteral=25
+ 0 400 400   1_date_
+ 1 400 400   
+ 0 400 400   // taskmarker=26
+ 0 400 400   /* TODO: sleep */
+ 1 400 400   
+ 0 400 400   // escapesequence=27
+ 0 400 400   "\001 \b"
+ 1 400 400   
+ 0 400 400   // Secondary styles inside preprocessor excluded section
+ 1 400 400   
+ 2 400 401 + #if 0
+ 1 401 401 | 
+ 0 401 401 | // default=0
+ 1 401 401 |    
+ 1 401 401 | 
+ 0 401 401 | // comment=1
+ 0 401 401 | /* */
+ 1 401 401 | 
+ 0 401 401 | /* commentline=2 */
+ 0 401 401 | // example line
+ 1 401 401 | 
+ 0 401 401 | // commentdoc=3
+ 0 401 401 | /** */
+ 1 401 401 | 
+ 0 401 401 | // number=4
+ 0 401 401 | 123
+ 1 401 401 | 
+ 0 401 401 | // word=5
+ 0 401 401 | int
+ 1 401 401 | 
+ 0 401 401 | // string=6
+ 0 401 401 | "string"
+ 1 401 401 | 
+ 0 401 401 | // character=7
+ 0 401 401 | 'c'
+ 1 401 401 | 
+ 0 401 401 | // uuid=8
+ 0 401 401 | uuid(3fd43029-1354-42f0-a5be-4a484c9c5250)
+ 1 401 401 | 
+ 0 401 401 | // preprocessor=9
+ 0 401 401 | #define xxx 1
+ 1 401 401 | 
+ 0 401 401 | // operator=10
+ 0 401 401 | {}
+ 1 401 401 | 
+ 0 401 401 | // identifier=11
+ 0 401 401 | identifier
+ 1 401 401 | 
+ 0 401 401 | // stringeol=12
+ 0 401 401 | "
+ 1 401 401 | 
+ 0 401 401 | // verbatim=13
+ 0 401 401 | @"verbatim"
+ 1 401 401 | 
+ 0 401 401 | // regex=14
+ 0 401 401 | (/regex/)
+ 1 401 401 | 
+ 0 401 401 | // commentlinedoc=15
+ 0 401 401 | /// example
+ 1 401 401 | 
+ 0 401 401 | // word2=16
+ 0 401 401 | second
+ 1 401 401 | 
+ 0 401 401 | // commentdockeyword=17
+ 0 401 401 | /** @file */
+ 1 401 401 | 
+ 0 401 401 | // commentdockeyworderror=18
+ 0 401 401 | /** @wrongkey */
+ 1 401 401 | 
+ 0 401 401 | // globalclass=19
+ 0 401 401 | global
+ 1 401 401 | 
+ 0 401 401 | // stringraw=20
+ 0 401 401 | R"( )"
+ 1 401 401 | 
+ 0 401 401 | // tripleverbatim=21
+ 0 401 401 | """ xx """
+ 1 401 401 | 
+ 0 401 401 | // hashquotedstring=22
+ 0 401 401 | #" xx "
+ 1 401 401 | 
+ 0 401 401 | // preprocessorcomment=23
+ 0 401 401 | #define /* comment */
+ 1 401 401 | 
+ 0 401 401 | // preprocessorcommentdoc=24
+ 0 401 401 | #define /** comment */
+ 1 401 401 | 
+ 0 401 401 | // userliteral=25
+ 0 401 401 | 1_date_
+ 1 401 401 | 
+ 0 401 401 | // taskmarker=26
+ 0 401 401 | /* TODO: sleep */
+ 1 401 401 | 
+ 0 401 401 | // escapesequence=27
+ 0 401 401 | "\001 \b"
+ 1 401 401 | 
+ 0 401 400 | #endif
+ 1 400 400   
\ No newline at end of file
diff --git a/lexilla/test/examples/cpp/AllStyles.cxx.styled b/lexilla/test/examples/cpp/AllStyles.cxx.styled
new file mode 100644
index 000000000..a8e03d605
--- /dev/null
+++ b/lexilla/test/examples/cpp/AllStyles.cxx.styled
@@ -0,0 +1,175 @@
+{2}// Enumerate all primary styles: 0 to 27 and secondary styles 64 to 91
+{0}
+{2}// default=0
+{0}   
+
+{2}// comment=1
+{1}/* */{0}
+
+{1}/* commentline=2 */{0}
+{2}// example line
+{0}
+{2}// commentdoc=3
+{3}/** */{0}
+
+{2}// number=4
+{4}123{0}
+
+{2}// word=5
+{5}int{0}
+
+{2}// string=6
+{6}"string"{0}
+
+{2}// character=7
+{7}'c'{0}
+
+{2}// uuid=8
+{5}uuid{10}({8}3fd43029-1354-42f0-a5be-4a484c9c5250{10}){0}
+
+{2}// preprocessor=9
+{9}#define xxx 1
+{0}
+{2}// operator=10
+{10}{}{0}
+
+{2}// identifier=11
+{11}identifier{0}
+
+{2}// stringeol=12
+{12}"
+{0}
+{2}// verbatim=13
+{13}@"verbatim"{0}
+
+{2}// regex=14
+{10}({14}/regex/{10}){0}
+
+{2}// commentlinedoc=15
+{15}/// example
+{0}
+{2}// word2=16
+{16}second{0}
+
+{2}// commentdockeyword=17
+{3}/** {17}@file{3} */{0}
+
+{2}// commentdockeyworderror=18
+{3}/** {18}@wrongkey{3} */{0}
+
+{2}// globalclass=19
+{19}global{0}
+
+{2}// stringraw=20
+{20}R"( )"{0}
+
+{2}// tripleverbatim=21
+{21}""" xx """{0}
+
+{2}// hashquotedstring=22
+{22}#" xx "{0}
+
+{2}// preprocessorcomment=23
+{9}#define {23}/* comment */{9}
+{0}
+{2}// preprocessorcommentdoc=24
+{9}#define {24}/** comment */{9}
+{0}
+{2}// userliteral=25
+{25}1_date_{0}
+
+{2}// taskmarker=26
+{1}/* {26}TODO{1}: sleep */{0}
+
+{2}// escapesequence=27
+{6}"{27}\001{6} {27}\b{6}"{0}
+
+{2}// Secondary styles inside preprocessor excluded section
+{0}
+{9}#if 0
+{64}
+{66}// default=0
+{64}   
+
+{66}// comment=1
+{65}/* */{64}
+
+{65}/* commentline=2 */{64}
+{66}// example line
+{64}
+{66}// commentdoc=3
+{67}/** */{64}
+
+{66}// number=4
+{68}123{64}
+
+{66}// word=5
+{69}int{64}
+
+{66}// string=6
+{70}"string"{64}
+
+{66}// character=7
+{71}'c'{64}
+
+{66}// uuid=8
+{69}uuid{74}({72}3fd43029-1354-42f0-a5be-4a484c9c5250{74}){64}
+
+{66}// preprocessor=9
+{73}#define xxx 1
+{64}
+{66}// operator=10
+{74}{}{64}
+
+{66}// identifier=11
+{75}identifier{64}
+
+{66}// stringeol=12
+{76}"
+{64}
+{66}// verbatim=13
+{77}@"verbatim"{64}
+
+{66}// regex=14
+{74}({78}/regex/{74}){64}
+
+{66}// commentlinedoc=15
+{79}/// example
+{64}
+{66}// word2=16
+{80}second{64}
+
+{66}// commentdockeyword=17
+{67}/** {81}@file{67} */{64}
+
+{66}// commentdockeyworderror=18
+{67}/** {82}@wrongkey{67} */{64}
+
+{66}// globalclass=19
+{83}global{64}
+
+{66}// stringraw=20
+{84}R"( )"{64}
+
+{66}// tripleverbatim=21
+{85}""" xx """{64}
+
+{66}// hashquotedstring=22
+{86}#" xx "{64}
+
+{66}// preprocessorcomment=23
+{73}#define {87}/* comment */{73}
+{64}
+{66}// preprocessorcommentdoc=24
+{73}#define {88}/** comment */{73}
+{64}
+{66}// userliteral=25
+{89}1_date_{64}
+
+{66}// taskmarker=26
+{65}/* {90}TODO{65}: sleep */{64}
+
+{66}// escapesequence=27
+{70}"{91}\001{70} {91}\b{70}"{64}
+
+{9}#endif
diff --git a/lexilla/test/examples/cpp/SciTE.properties b/lexilla/test/examples/cpp/SciTE.properties
index 53c6a60f5..db1b1803d 100644
--- a/lexilla/test/examples/cpp/SciTE.properties
+++ b/lexilla/test/examples/cpp/SciTE.properties
@@ -1,9 +1,18 @@
 lexer.*.cxx=cpp
-keywords.*.cxx=int let
-keywords2.*.cxx=
+keywords.*.cxx=int let uuid
+keywords2.*.cxx=second
 keywords3.*.cxx=file
+keywords4.*.cxx=global
+keywords5.*.cxx=
+keywords6.*.cxx=TODO
+
 lexer.cpp.track.preprocessor=1
 lexer.cpp.escape.sequence=1
+# Set options so that AllStyles.cxx can show every style
+styling.within.preprocessor=0
+lexer.cpp.triplequoted.strings=1
+lexer.cpp.hashquoted.strings=1
+
 fold=1
 fold.preprocessor=1
 fold.comment=1
diff --git a/lexilla/test/examples/fsharp/Issue93.fs b/lexilla/test/examples/fsharp/Issue93.fs
new file mode 100644
index 000000000..c63bea170
--- /dev/null
+++ b/lexilla/test/examples/fsharp/Issue93.fs
@@ -0,0 +1,46 @@
+(*
+    (**  nested comment 1 **)
+    (*
+        nested comment 2
+        (*
+            nested comment 3
+            (*
+                nested comment 4
+                (*
+                    nested comment 5
+                *)
+            *)
+        *)
+    *)
+*)
+// declare a namespace
+// for the module
+namespace Issue93
+
+module NestedComments =
+    open FSharp.Quotations
+    open FSharp.Quotations.Patterns
+    // print the arguments
+    // of an evaluated expression
+    (* Example:
+        (*
+            printArgs <@ 1 + 2 @> ;;
+            // 1
+            // 2
+        *)
+    *)
+    let printArgs expr =
+        let getVal = function Value (v, _) -> downcast v | _ -> null
+        match expr with
+        | Call (_, _, args) ->
+            List.map getVal args |> List.iter (printfn "%A")
+        | _ ->
+            printfn "not an evaluated expression"
+    (* Example:
+        (*
+            let constExpr = <@ true @> ;;
+            printArgs constExpr ;;
+        *)
+    *)
+    // Prints:
+    // "not an evaluated expression"
diff --git a/lexilla/test/examples/fsharp/Issue93.fs.folded b/lexilla/test/examples/fsharp/Issue93.fs.folded
new file mode 100644
index 000000000..c27577242
--- /dev/null
+++ b/lexilla/test/examples/fsharp/Issue93.fs.folded
@@ -0,0 +1,47 @@
+ 2 400 401 + (*
+ 0 401 401 |     (**  nested comment 1 **)
+ 2 401 402 +     (*
+ 0 402 402 |         nested comment 2
+ 2 402 403 +         (*
+ 0 403 403 |             nested comment 3
+ 2 403 404 +             (*
+ 0 404 404 |                 nested comment 4
+ 2 404 405 +                 (*
+ 0 405 405 |                     nested comment 5
+ 0 405 404 |                 *)
+ 0 404 403 |             *)
+ 0 403 402 |         *)
+ 0 402 401 |     *)
+ 0 401 400 | *)
+ 2 400 401 + // declare a namespace
+ 0 401 400 | // for the module
+ 0 400 400   namespace Issue93
+ 1 400 400   
+ 0 400 400   module NestedComments =
+ 2 400 401 +     open FSharp.Quotations
+ 0 401 400 |     open FSharp.Quotations.Patterns
+ 2 400 401 +     // print the arguments
+ 0 401 400 |     // of an evaluated expression
+ 2 400 401 +     (* Example:
+ 2 401 402 +         (*
+ 0 402 402 |             printArgs <@ 1 + 2 @> ;;
+ 0 402 402 |             // 1
+ 0 402 402 |             // 2
+ 0 402 401 |         *)
+ 0 401 400 |     *)
+ 0 400 400       let printArgs expr =
+ 0 400 400           let getVal = function Value (v, _) -> downcast v | _ -> null
+ 0 400 400           match expr with
+ 0 400 400           | Call (_, _, args) ->
+ 0 400 400               List.map getVal args |> List.iter (printfn "%A")
+ 0 400 400           | _ ->
+ 0 400 400               printfn "not an evaluated expression"
+ 2 400 401 +     (* Example:
+ 2 401 402 +         (*
+ 0 402 402 |             let constExpr = <@ true @> ;;
+ 0 402 402 |             printArgs constExpr ;;
+ 0 402 401 |         *)
+ 0 401 400 |     *)
+ 2 400 401 +     // Prints:
+ 0 401 400 |     // "not an evaluated expression"
+ 1 400 400   
\ No newline at end of file
diff --git a/lexilla/test/examples/fsharp/Issue93.fs.styled b/lexilla/test/examples/fsharp/Issue93.fs.styled
new file mode 100644
index 000000000..aa171a06f
--- /dev/null
+++ b/lexilla/test/examples/fsharp/Issue93.fs.styled
@@ -0,0 +1,46 @@
+{8}(*
+    (**  nested comment 1 **)
+    (*
+        nested comment 2
+        (*
+            nested comment 3
+            (*
+                nested comment 4
+                (*
+                    nested comment 5
+                *)
+            *)
+        *)
+    *)
+*){0}
+{9}// declare a namespace{0}
+{9}// for the module{0}
+{1}namespace{0} {6}Issue93{0}
+
+{1}module{0} {6}NestedComments{0} {12}={0}
+    {1}open{0} {3}FSharp{0}.{6}Quotations{0}
+    {1}open{0} {3}FSharp{0}.{6}Quotations{0}.{6}Patterns{0}
+    {9}// print the arguments{0}
+    {9}// of an evaluated expression{0}
+    {8}(* Example:
+        (*
+            printArgs <@ 1 + 2 @> ;;
+            // 1
+            // 2
+        *)
+    *){0}
+    {1}let{0} {6}printArgs{0} {6}expr{0} {12}={0}
+        {1}let{0} {6}getVal{0} {12}={0} {1}function{0} {6}Value{0} {12}({6}v{12},{0} {6}_{12}){0} {12}->{0} {1}downcast{0} {6}v{0} {12}|{0} {6}_{0} {12}->{0} {1}null{0}
+        {1}match{0} {6}expr{0} {1}with{0}
+        {12}|{0} {6}Call{0} {12}({6}_{12},{0} {6}_{12},{0} {6}args{12}){0} {12}->{0}
+            {3}List{0}.{2}map{0} {6}getVal{0} {6}args{0} {12}|>{0} {3}List{0}.{2}iter{0} {12}({2}printfn{0} {15}"{19}%A{15}"{12}){0}
+        {12}|{0} {6}_{0} {12}->{0}
+            {2}printfn{0} {15}"not an evaluated expression"{0}
+    {8}(* Example:
+        (*
+            let constExpr = <@ true @> ;;
+            printArgs constExpr ;;
+        *)
+    *){0}
+    {9}// Prints:{0}
+    {9}// "not an evaluated expression"{0}
diff --git a/lexilla/test/examples/gui4cli/AllStyles.gui b/lexilla/test/examples/gui4cli/AllStyles.gui
new file mode 100644
index 000000000..36302a249
--- /dev/null
+++ b/lexilla/test/examples/gui4cli/AllStyles.gui
@@ -0,0 +1,26 @@
+/* Comment (2), followed by Default (0) */
+
+/* File does not include Line Comment (1) as that causes \r\n failures in test runner */
+
+/* Global (3) 'G4C' */
+G4C MyGui
+
+/* String (8) */
+Window 10 10 200 300 "My window"
+
+/* Event (4) */
+xOnLoad
+     /* Command (7) */
+     GuiOpen MyGui
+
+xButton 10 10 100 20 "Double it!"
+     /* Attribute (5) */
+     attr frame sunk
+     Input "Enter a number" var
+     /* Control (6) 'if', Operator (9) '$', '>', '=' */
+     if $var > 9999
+          var = 9999
+     endif
+     var2 = $($var * 2)
+     MsgBox "$var times 2 equals $var2" OK/INFO
+     GuiQuit #this
diff --git a/lexilla/test/examples/gui4cli/AllStyles.gui.folded b/lexilla/test/examples/gui4cli/AllStyles.gui.folded
new file mode 100644
index 000000000..eccb6d95a
--- /dev/null
+++ b/lexilla/test/examples/gui4cli/AllStyles.gui.folded
@@ -0,0 +1,27 @@
+ 0 401   0 | /* Comment (2), followed by Default (0) */
+ 1 401   0 | 
+ 0 401   0 | /* File does not include Line Comment (1) as that causes \r\n failures in test runner */
+ 1 401   0 | 
+ 0 401   0 | /* Global (3) 'G4C' */
+ 2 400   0 + G4C MyGui
+ 1 401   0 | 
+ 0 401   0 | /* String (8) */
+ 2 400   0 + Window 10 10 200 300 "My window"
+ 1 401   0 | 
+ 0 401   0 | /* Event (4) */
+ 2 400   0 + xOnLoad
+ 0 401   0 |      /* Command (7) */
+ 0 401   0 |      GuiOpen MyGui
+ 1 401   0 | 
+ 2 400   0 + xButton 10 10 100 20 "Double it!"
+ 0 401   0 |      /* Attribute (5) */
+ 0 401   0 |      attr frame sunk
+ 0 401   0 |      Input "Enter a number" var
+ 0 401   0 |      /* Control (6) 'if', Operator (9) '$', '>', '=' */
+ 0 401   0 |      if $var > 9999
+ 0 401   0 |           var = 9999
+ 0 401   0 |      endif
+ 0 401   0 |      var2 = $($var * 2)
+ 0 401   0 |      MsgBox "$var times 2 equals $var2" OK/INFO
+ 0 401   0 |      GuiQuit #this
+ 0 401   0 | 
\ No newline at end of file
diff --git a/lexilla/test/examples/gui4cli/AllStyles.gui.styled b/lexilla/test/examples/gui4cli/AllStyles.gui.styled
new file mode 100644
index 000000000..bffd508c5
--- /dev/null
+++ b/lexilla/test/examples/gui4cli/AllStyles.gui.styled
@@ -0,0 +1,26 @@
+{2}/* Comment (2), followed by Default (0) */{0}
+
+{2}/* File does not include Line Comment (1) as that causes \r\n failures in test runner */{0}
+
+{2}/* Global (3) 'G4C' */{0}
+{3}G4C{0} MyGui
+
+{2}/* String (8) */{0}
+{3}Window{0} 10 10 200 300 {8}"My window"{0}
+
+{2}/* Event (4) */{0}
+{4}xOnLoad{0}
+     {2}/* Command (7) */{0}
+     {7}GuiOpen{0} MyGui
+
+{3}xButton{0} 10 10 100 20 {8}"Double it!"{0}
+     {2}/* Attribute (5) */{0}
+     {5}attr{0} frame sunk
+     {7}Input{0} {8}"Enter a number"{0} var
+     {2}/* Control (6) 'if', Operator (9) '$', '>', '=' */{0}
+     {6}if{0} {9}${0}var {9}>{0} 9999
+          var {9}={0} 9999
+     {6}endif{0}
+     var2 {9}={0} {9}${0}({9}${0}var * 2)
+     {7}MsgBox{0} {8}"$var times 2 equals $var2"{0} OK/INFO
+     {7}GuiQuit{0} #this
diff --git a/lexilla/test/examples/gui4cli/SciTE.properties b/lexilla/test/examples/gui4cli/SciTE.properties
new file mode 100644
index 000000000..fdb5a04cb
--- /dev/null
+++ b/lexilla/test/examples/gui4cli/SciTE.properties
@@ -0,0 +1,13 @@
+lexer.*.gui=gui4cli
+fold=1
+
+#global
+keywords.*.gui=G4C WINDOW XBUTTON
+#event
+keywords2.*.gui=XONCLOSE XONLVDIR XONLOAD
+#attribute
+keywords3.*.gui=ATTR
+#control
+keywords4.*.gui=IF ELSE ENDIF GOSUB
+#command
+keywords5.*.gui=GUIOPEN GUIQUIT INPUT MSGBOX SETWINTITLE
diff --git a/lexilla/test/examples/julia/x.jl b/lexilla/test/examples/julia/x.jl
index 3462807ff..54d546b31 100644
--- a/lexilla/test/examples/julia/x.jl
+++ b/lexilla/test/examples/julia/x.jl
@@ -14,6 +14,11 @@ end
 @enum Unicode α=1 β=2
 
 res = [√i for i in 1:10]
+∀=1; ∃=2; ∄=3;
+
+t!'#'
+t!='#'
+t[]!='#'
 
 #= Dummy function =#
 test_fun²(:sym, true, raw"test", `echo 1`)
diff --git a/lexilla/test/examples/julia/x.jl.folded b/lexilla/test/examples/julia/x.jl.folded
index 2e0ebdfa9..65b4aa445 100644
--- a/lexilla/test/examples/julia/x.jl.folded
+++ b/lexilla/test/examples/julia/x.jl.folded
@@ -14,6 +14,11 @@
  0 400 400   @enum Unicode α=1 β=2
  0 400 400   
  0 400 400   res = [√i for i in 1:10]
+ 0 400 400   ∀=1; ∃=2; ∄=3;
+ 0 400 400   
+ 0 400 400   t!'#'
+ 0 400 400   t!='#'
+ 0 400 400   t[]!='#'
  0 400 400   
  0 400 400   #= Dummy function =#
  0 400 400   test_fun²(:sym, true, raw"test", `echo 1`)
diff --git a/lexilla/test/examples/julia/x.jl.styled b/lexilla/test/examples/julia/x.jl.styled
index 79b966ebb..8a0cff349 100644
--- a/lexilla/test/examples/julia/x.jl.styled
+++ b/lexilla/test/examples/julia/x.jl.styled
@@ -14,6 +14,11 @@ For test only
 {12}@enum{0} {9}Unicode{0} {9}α{7}={2}1{0} {9}β{7}={2}2{0}
 
 {9}res{0} {7}={0} {8}[{7}√{9}i{0} {3}for{0} {9}i{0} {3}in{0} {2}1{7}:{2}10{8}]{0}
+{9}∀{7}={2}1{7};{0} {9}∃{7}={2}2{7};{0} {9}∄{7}={2}3{7};{0}
+
+{9}t!{7}'{1}#'{0}
+{9}t!{7}={6}'#'{0}
+{9}t{8}[]{7}!={6}'#'{0}
 
 {1}#= Dummy function =#{0}
 {9}test_fun²{8}({11}:sym{7},{0} {5}true{7},{0} {15}raw{10}"test"{7},{0} {16}`echo 1`{8}){0}
diff --git a/lexilla/test/examples/mssql/AllStyles.tsql b/lexilla/test/examples/mssql/AllStyles.tsql
new file mode 100644
index 000000000..ffb0b810f
--- /dev/null
+++ b/lexilla/test/examples/mssql/AllStyles.tsql
@@ -0,0 +1,52 @@
+-- Enumerate all styles: 0 to 16
+
+/* block comment = 1*/
+
+-- whitespace = 0
+    -- spaces
+
+-- line comment = 2
+
+-- number = 3
+376
+
+-- string = 4
+'a string'
+
+-- operator = 5
+()
+INTERSECT
+
+-- identifier = 6
+ProductID;
+
+-- variable = 7
+@Variable;
+
+-- column name = 8
+"COLUMN";
+
+-- statement = 9
+PRINT
+
+-- datatype = 10
+int
+
+-- systable = 11
+sysobjects
+
+-- global variable = 12
+@@ERROR
+
+-- function = 13
+object_id
+
+-- stored procedure = 14
+sp_fulltext_database
+
+-- default (preferencing data type) = 15
+x --
+
+-- column name 2 = 16
+[COLUMN];
+
diff --git a/lexilla/test/examples/mssql/AllStyles.tsql.folded b/lexilla/test/examples/mssql/AllStyles.tsql.folded
new file mode 100644
index 000000000..797cfaf00
--- /dev/null
+++ b/lexilla/test/examples/mssql/AllStyles.tsql.folded
@@ -0,0 +1,53 @@
+ 0 400   0   -- Enumerate all styles: 0 to 16
+ 1 400   0   
+ 0 400   0   /* block comment = 1*/
+ 1 400   0   
+ 0 400   0   -- whitespace = 0
+ 0 400   0       -- spaces
+ 1 400   0   
+ 0 400   0   -- line comment = 2
+ 1 400   0   
+ 0 400   0   -- number = 3
+ 0 400   0   376
+ 1 400   0   
+ 0 400   0   -- string = 4
+ 0 400   0   'a string'
+ 1 400   0   
+ 0 400   0   -- operator = 5
+ 0 400   0   ()
+ 0 400   0   INTERSECT
+ 1 400   0   
+ 0 400   0   -- identifier = 6
+ 0 400   0   ProductID;
+ 1 400   0   
+ 0 400   0   -- variable = 7
+ 0 400   0   @Variable;
+ 1 400   0   
+ 0 400   0   -- column name = 8
+ 0 400   0   "COLUMN";
+ 1 400   0   
+ 0 400   0   -- statement = 9
+ 0 400   0   PRINT
+ 1 400   0   
+ 0 400   0   -- datatype = 10
+ 0 400   0   int
+ 1 400   0   
+ 0 400   0   -- systable = 11
+ 0 400   0   sysobjects
+ 1 400   0   
+ 0 400   0   -- global variable = 12
+ 0 400   0   @@ERROR
+ 1 400   0   
+ 0 400   0   -- function = 13
+ 0 400   0   object_id
+ 1 400   0   
+ 0 400   0   -- stored procedure = 14
+ 0 400   0   sp_fulltext_database
+ 1 400   0   
+ 0 400   0   -- default (preferencing data type) = 15
+ 0 400   0   x --
+ 1 400   0   
+ 0 400   0   -- column name 2 = 16
+ 0 400   0   [COLUMN];
+ 1 400   0   
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/mssql/AllStyles.tsql.styled b/lexilla/test/examples/mssql/AllStyles.tsql.styled
new file mode 100644
index 000000000..a28ff12e4
--- /dev/null
+++ b/lexilla/test/examples/mssql/AllStyles.tsql.styled
@@ -0,0 +1,52 @@
+{2}-- Enumerate all styles: 0 to 16{0}
+
+{1}/* block comment = 1*/{0}
+
+{2}-- whitespace = 0{0}
+    {2}-- spaces{0}
+
+{2}-- line comment = 2{0}
+
+{2}-- number = 3{0}
+{3}376{0}
+
+{2}-- string = 4{0}
+{4}'a string'{0}
+
+{2}-- operator = 5{0}
+{5}(){0}
+{5}INTERSECT{0}
+
+{2}-- identifier = 6{0}
+{6}ProductID{5};{0}
+
+{2}-- variable = 7{0}
+{7}@Variable{5};{0}
+
+{2}-- column name = 8{0}
+{8}"COLUMN"{5};{0}
+
+{2}-- statement = 9{0}
+{9}PRINT{0}
+
+{2}-- datatype = 10{0}
+{10}int{0}
+
+{2}-- systable = 11{0}
+{11}sysobjects{0}
+
+{2}-- global variable = 12{0}
+{12}@@ERROR{0}
+
+{2}-- function = 13{0}
+{13}object_id{0}
+
+{2}-- stored procedure = 14{0}
+{14}sp_fulltext_database{0}
+
+{2}-- default (preferencing data type) = 15{0}
+{6}x{15} {2}--{0}
+
+{2}-- column name 2 = 16{0}
+{16}[COLUMN]{5};{0}
+
diff --git a/lexilla/test/examples/mssql/Issue87.tsql b/lexilla/test/examples/mssql/Issue87.tsql
new file mode 100644
index 000000000..c1ccde264
--- /dev/null
+++ b/lexilla/test/examples/mssql/Issue87.tsql
@@ -0,0 +1,8 @@
+/**
+ /*
+  GitHub Issue 87
+  /*
+    /****** Object:  Table [dbo].[Issue87]    Script Date: 04/06/2022 8:07:57 PM ******/
+   */
+  */
+ */
diff --git a/lexilla/test/examples/mssql/Issue87.tsql.folded b/lexilla/test/examples/mssql/Issue87.tsql.folded
new file mode 100644
index 000000000..2f94a688b
--- /dev/null
+++ b/lexilla/test/examples/mssql/Issue87.tsql.folded
@@ -0,0 +1,9 @@
+ 2 400   0 + /**
+ 0 401   0 |  /*
+ 0 401   0 |   GitHub Issue 87
+ 0 401   0 |   /*
+ 0 401   0 |     /****** Object:  Table [dbo].[Issue87]    Script Date: 04/06/2022 8:07:57 PM ******/
+ 0 401   0 |    */
+ 0 401   0 |   */
+ 0 401   0 |  */
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/mssql/Issue87.tsql.styled b/lexilla/test/examples/mssql/Issue87.tsql.styled
new file mode 100644
index 000000000..e9e3bb141
--- /dev/null
+++ b/lexilla/test/examples/mssql/Issue87.tsql.styled
@@ -0,0 +1,8 @@
+{1}/**
+ /*
+  GitHub Issue 87
+  /*
+    /****** Object:  Table [dbo].[Issue87]    Script Date: 04/06/2022 8:07:57 PM ******/
+   */
+  */
+ */{0}
diff --git a/lexilla/test/examples/mssql/Issue90.tsql b/lexilla/test/examples/mssql/Issue90.tsql
new file mode 100644
index 000000000..e0c5359b6
--- /dev/null
+++ b/lexilla/test/examples/mssql/Issue90.tsql
@@ -0,0 +1,4 @@
+CREATE TABLE TestTable (
+    col
+    CHAR(3)
+);
diff --git a/lexilla/test/examples/mssql/Issue90.tsql.folded b/lexilla/test/examples/mssql/Issue90.tsql.folded
new file mode 100644
index 000000000..60ed82824
--- /dev/null
+++ b/lexilla/test/examples/mssql/Issue90.tsql.folded
@@ -0,0 +1,5 @@
+ 0 400   0   CREATE TABLE TestTable (
+ 0 400   0       col
+ 0 400   0       CHAR(3)
+ 0 400   0   );
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/mssql/Issue90.tsql.styled b/lexilla/test/examples/mssql/Issue90.tsql.styled
new file mode 100644
index 000000000..c5ddb6117
--- /dev/null
+++ b/lexilla/test/examples/mssql/Issue90.tsql.styled
@@ -0,0 +1,4 @@
+{9}CREATE{0} {9}TABLE{0} {6}TestTable{15} {5}({0}
+    {6}col{15}
+    {10}CHAR{5}({3}3{5}){0}
+{5});{0}
diff --git a/lexilla/test/examples/mssql/SciTE.properties b/lexilla/test/examples/mssql/SciTE.properties
new file mode 100644
index 000000000..3e3b17cf2
--- /dev/null
+++ b/lexilla/test/examples/mssql/SciTE.properties
@@ -0,0 +1,25 @@
+lexer.*.tsql=mssql
+fold=1
+fold.comment=1
+
+# statement
+keywords.*.tsql=and as begin by create declare distinct drop else end exists from go if in insert into is inner \
+join like not null on order print procedure return select set table use values where while
+
+# data type
+keywords2.*.tsql=char int
+
+# System table
+keywords3.*.tsql=sysobjects
+
+# global variables
+keywords4.*.tsql=error
+
+# functions
+keywords5.*.tsql=ascii char object_id
+
+# System stored procedures
+keywords6.*.tsql=sp_fulltext_database
+
+# operators
+keywords7.*.tsql=intersect
diff --git a/lexilla/test/examples/mssql/Various.tsql b/lexilla/test/examples/mssql/Various.tsql
new file mode 100644
index 000000000..baed735b3
--- /dev/null
+++ b/lexilla/test/examples/mssql/Various.tsql
@@ -0,0 +1,104 @@
+/* This file contains snippets of Transact-SQL that exercise various aspects of the language. */
+/**
+ /*
+  AllStyles.tsql
+  /*
+    /****** Object:  Database [AllStyles]    Script Date: 06/16/2022 10:56:35 PM ******/
+   */
+  */
+ */
+IF (1 = FULLTEXTSERVICEPROPERTY('IsFullTextInstalled'))
+BEGIN
+    EXEC sp_fulltext_database @action = 'enable';
+END
+USE AllStyles;
+GO
+SELECT *
+FROM Production.Product
+ORDER BY Name ASC;
+-- Alternate way.
+USE AllStyles;
+GO
+SELECT p.*
+FROM Production.Product AS p
+ORDER BY Name ASC;
+GO
+
+SELECT "COLUMN" FROM "TABLE"
+SELECT "COLUMN" int FROM "TABLE"
+
+SELECT schema_name
+    (tab.schema_id) AS schema_name
+    -- retrieve the name, too
+    ,tab.name
+FROM sys.tables AS tab;
+
+SELECT DISTINCT Name
+FROM Production.Product AS p
+WHERE EXISTS
+    (SELECT *
+     FROM Production.ProductModel AS pm
+     WHERE p.ProductModelID = pm.ProductModelID
+           AND pm.Name LIKE 'Long-Sleeve Logo Jersey%');
+
+SELECT DISTINCT p.LastName, p.FirstName
+FROM Person.Person AS p
+JOIN HumanResources.Employee AS e
+    ON e.BusinessEntityID = p.BusinessEntityID WHERE 5000.00 IN
+    (SELECT Bonus
+     FROM Sales.SalesPerson AS sp
+     WHERE e.BusinessEntityID = sp.BusinessEntityID);
+
+CREATE PROCEDURE findjobs @nm sysname = NULL
+AS
+IF @nm IS NULL
+    BEGIN
+        PRINT 'You must give a user name'
+        RETURN
+    END
+ELSE
+    BEGIN
+        SELECT o.name, o.id, o.uid
+        FROM sysobjects o INNER JOIN master.syslogins l
+            ON o.uid = l.sid
+        WHERE l.name = @nm
+    END;
+
+CREATE TABLE TestTable (cola INT, colb CHAR(3));
+-- Declare the variable to be used.
+DECLARE @MyCounter INT;
+
+-- Initialize the variable.
+SET @MyCounter = 0;
+WHILE (@MyCounter < 26)
+BEGIN;
+   -- Insert a row into the table.
+   INSERT INTO TestTable VALUES
+       -- Use the variable to provide the integer value
+       -- for cola. Also use it to generate a unique letter
+       -- for each row. Use the ASCII function to get the
+       -- integer value of 'a'. Add @MyCounter. Use CHAR to
+       -- convert the sum back to the character @MyCounter
+       -- characters after 'a'.
+       (@MyCounter,
+        CHAR( ( @MyCounter + ASCII('a') ) )
+       );
+   -- Increment the variable to count this iteration
+   -- of the loop.
+   SET @MyCounter = @MyCounter + 1;
+END;
+
+IF @@ERROR = 547
+    BEGIN
+    PRINT N'A check constraint violation occurred.';
+    END
+GO
+
+USE [AllStyles].[dbo].[test]
+GO
+
+SELECT ProductID
+FROM Production.Product
+INTERSECT
+SELECT ProductID
+FROM Production.WorkOrder ;
diff --git a/lexilla/test/examples/mssql/Various.tsql.folded b/lexilla/test/examples/mssql/Various.tsql.folded
new file mode 100644
index 000000000..e822bef84
--- /dev/null
+++ b/lexilla/test/examples/mssql/Various.tsql.folded
@@ -0,0 +1,105 @@
+ 0 400   0   /* This file contains snippets of Transact-SQL that exercise various aspects of the language. */
+ 2 400   0 + /**
+ 0 401   0 |  /*
+ 0 401   0 |   AllStyles.tsql
+ 0 401   0 |   /*
+ 0 401   0 |     /****** Object:  Database [AllStyles]    Script Date: 06/16/2022 10:56:35 PM ******/
+ 0 401   0 |    */
+ 0 401   0 |   */
+ 0 401   0 |  */
+ 0 400   0   IF (1 = FULLTEXTSERVICEPROPERTY('IsFullTextInstalled'))
+ 2 400   0 + BEGIN
+ 0 401   0 |     EXEC sp_fulltext_database @action = 'enable';
+ 0 401   0 | END
+ 0 400   0   USE AllStyles;
+ 0 400   0   GO
+ 0 400   0   SELECT *
+ 0 400   0   FROM Production.Product
+ 0 400   0   ORDER BY Name ASC;
+ 0 400   0   -- Alternate way.
+ 0 400   0   USE AllStyles;
+ 0 400   0   GO
+ 0 400   0   SELECT p.*
+ 0 400   0   FROM Production.Product AS p
+ 0 400   0   ORDER BY Name ASC;
+ 0 400   0   GO
+ 1 400   0   
+ 0 400   0   SELECT "COLUMN" FROM "TABLE"
+ 0 400   0   SELECT "COLUMN" int FROM "TABLE"
+ 1 400   0   
+ 0 400   0   SELECT schema_name
+ 0 400   0       (tab.schema_id) AS schema_name
+ 0 400   0       -- retrieve the name, too
+ 0 400   0       ,tab.name
+ 0 400   0   FROM sys.tables AS tab;
+ 1 400   0   
+ 0 400   0   SELECT DISTINCT Name
+ 0 400   0   FROM Production.Product AS p
+ 0 400   0   WHERE EXISTS
+ 0 400   0       (SELECT *
+ 0 400   0        FROM Production.ProductModel AS pm
+ 0 400   0        WHERE p.ProductModelID = pm.ProductModelID
+ 0 400   0              AND pm.Name LIKE 'Long-Sleeve Logo Jersey%');
+ 1 400   0   
+ 0 400   0   SELECT DISTINCT p.LastName, p.FirstName
+ 0 400   0   FROM Person.Person AS p
+ 0 400   0   JOIN HumanResources.Employee AS e
+ 0 400   0       ON e.BusinessEntityID = p.BusinessEntityID WHERE 5000.00 IN
+ 0 400   0       (SELECT Bonus
+ 0 400   0        FROM Sales.SalesPerson AS sp
+ 0 400   0        WHERE e.BusinessEntityID = sp.BusinessEntityID);
+ 1 400   0   
+ 0 400   0   CREATE PROCEDURE findjobs @nm sysname = NULL
+ 0 400   0   AS
+ 0 400   0   IF @nm IS NULL
+ 2 400   0 +     BEGIN
+ 0 401   0 |         PRINT 'You must give a user name'
+ 0 401   0 |         RETURN
+ 0 401   0 |     END
+ 0 400   0   ELSE
+ 2 400   0 +     BEGIN
+ 0 401   0 |         SELECT o.name, o.id, o.uid
+ 0 401   0 |         FROM sysobjects o INNER JOIN master.syslogins l
+ 0 401   0 |             ON o.uid = l.sid
+ 0 401   0 |         WHERE l.name = @nm
+ 0 401   0 |     END;
+ 1 400   0   
+ 0 400   0   CREATE TABLE TestTable (cola INT, colb CHAR(3));
+ 0 400   0   -- Declare the variable to be used.
+ 0 400   0   DECLARE @MyCounter INT;
+ 1 400   0   
+ 0 400   0   -- Initialize the variable.
+ 0 400   0   SET @MyCounter = 0;
+ 0 400   0   WHILE (@MyCounter < 26)
+ 2 400   0 + BEGIN;
+ 0 401   0 |    -- Insert a row into the table.
+ 0 401   0 |    INSERT INTO TestTable VALUES
+ 0 401   0 |        -- Use the variable to provide the integer value
+ 0 401   0 |        -- for cola. Also use it to generate a unique letter
+ 0 401   0 |        -- for each row. Use the ASCII function to get the
+ 0 401   0 |        -- integer value of 'a'. Add @MyCounter. Use CHAR to
+ 0 401   0 |        -- convert the sum back to the character @MyCounter
+ 0 401   0 |        -- characters after 'a'.
+ 0 401   0 |        (@MyCounter,
+ 0 401   0 |         CHAR( ( @MyCounter + ASCII('a') ) )
+ 0 401   0 |        );
+ 0 401   0 |    -- Increment the variable to count this iteration
+ 0 401   0 |    -- of the loop.
+ 0 401   0 |    SET @MyCounter = @MyCounter + 1;
+ 0 401   0 | END;
+ 1 400   0   
+ 0 400   0   IF @@ERROR = 547
+ 2 400   0 +     BEGIN
+ 0 401   0 |     PRINT N'A check constraint violation occurred.';
+ 0 401   0 |     END
+ 0 400   0   GO
+ 1 400   0   
+ 0 400   0   USE [AllStyles].[dbo].[test]
+ 0 400   0   GO
+ 1 400   0   
+ 0 400   0   SELECT ProductID
+ 0 400   0   FROM Production.Product
+ 0 400   0   INTERSECT
+ 0 400   0   SELECT ProductID
+ 0 400   0   FROM Production.WorkOrder ;
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/mssql/Various.tsql.styled b/lexilla/test/examples/mssql/Various.tsql.styled
new file mode 100644
index 000000000..9543d317a
--- /dev/null
+++ b/lexilla/test/examples/mssql/Various.tsql.styled
@@ -0,0 +1,104 @@
+{1}/* This file contains snippets of Transact-SQL that exercise various aspects of the language. */{0}
+{1}/**
+ /*
+  AllStyles.tsql
+  /*
+    /****** Object:  Database [AllStyles]    Script Date: 06/16/2022 10:56:35 PM ******/
+   */
+  */
+ */{0}
+{9}IF{0} {5}({3}1{0} {5}={0} {6}FULLTEXTSERVICEPROPERTY{5}({4}'IsFullTextInstalled'{5})){0}
+{9}BEGIN{0}
+    {6}EXEC{15} {14}sp_fulltext_database{0} {7}@action{15} {5}={0} {4}'enable'{5};{0}
+{9}END{0}
+{9}USE{0} {6}AllStyles{5};{0}
+{9}GO{0}
+{9}SELECT{0} {5}*{0}
+{9}FROM{0} {6}Production.Product{15}
+{9}ORDER{0} {9}BY{0} {6}Name{15} {6}ASC{5};{0}
+{2}-- Alternate way.{0}
+{9}USE{0} {6}AllStyles{5};{0}
+{9}GO{0}
+{9}SELECT{0} {6}p.{5}*{0}
+{9}FROM{0} {6}Production.Product{15} {9}AS{0} {6}p{15}
+{9}ORDER{0} {9}BY{0} {6}Name{15} {6}ASC{5};{0}
+{9}GO{0}
+
+{9}SELECT{0} {8}"COLUMN"{15} {9}FROM{0} {8}"TABLE"{15}
+{9}SELECT{0} {8}"COLUMN"{15} {10}int{0} {9}FROM{0} {8}"TABLE"{15}
+
+{9}SELECT{0} {6}schema_name{15}
+    {5}({6}tab.schema_id{5}){0} {9}AS{0} {6}schema_name{15}
+    {2}-- retrieve the name, too{0}
+    {5},{6}tab.name{15}
+{9}FROM{0} {6}sys.tables{15} {9}AS{0} {6}tab{5};{0}
+
+{9}SELECT{0} {9}DISTINCT{0} {6}Name{15}
+{9}FROM{0} {6}Production.Product{15} {9}AS{0} {6}p{15}
+{9}WHERE{0} {9}EXISTS{0}
+    {5}({9}SELECT{0} {5}*{0}
+     {9}FROM{0} {6}Production.ProductModel{15} {9}AS{0} {6}pm{15}
+     {9}WHERE{0} {6}p.ProductModelID{15} {5}={0} {6}pm.ProductModelID{15}
+           {9}AND{0} {6}pm.Name{15} {9}LIKE{0} {4}'Long-Sleeve Logo Jersey%'{5});{0}
+
+{9}SELECT{0} {9}DISTINCT{0} {6}p.LastName{5},{0} {6}p.FirstName{15}
+{9}FROM{0} {6}Person.Person{15} {9}AS{0} {6}p{15}
+{9}JOIN{0} {6}HumanResources.Employee{15} {9}AS{0} {6}e{15}
+    {9}ON{0} {6}e.BusinessEntityID{15} {5}={0} {6}p.BusinessEntityID{15} {9}WHERE{0} {3}5000.00{0} {9}IN{0}
+    {5}({9}SELECT{0} {6}Bonus{15}
+     {9}FROM{0} {6}Sales.SalesPerson{15} {9}AS{0} {6}sp{15}
+     {9}WHERE{0} {6}e.BusinessEntityID{15} {5}={0} {6}sp.BusinessEntityID{5});{0}
+
+{9}CREATE{0} {9}PROCEDURE{0} {6}findjobs{0} {7}@nm{15} {6}sysname{15} {5}={0} {9}NULL{0}
+{9}AS{0}
+{9}IF{0} {7}@nm{15} {9}IS{0} {9}NULL{0}
+    {9}BEGIN{0}
+        {9}PRINT{0} {4}'You must give a user name'{0}
+        {9}RETURN{0}
+    {9}END{0}
+{9}ELSE{0}
+    {9}BEGIN{0}
+        {9}SELECT{0} {6}o.name{5},{0} {6}o.id{5},{0} {6}o.uid{15}
+        {9}FROM{0} {11}sysobjects{0} {6}o{15} {9}INNER{0} {9}JOIN{0} {6}master.syslogins{15} {6}l{15}
+            {9}ON{0} {6}o.uid{15} {5}={0} {6}l.sid{15}
+        {9}WHERE{0} {6}l.name{15} {5}={0} {7}@nm{15}
+    {9}END{5};{0}
+
+{9}CREATE{0} {9}TABLE{0} {6}TestTable{15} {5}({6}cola{15} {10}INT{5},{0} {6}colb{15} {10}CHAR{5}({3}3{5}));{0}
+{2}-- Declare the variable to be used.{0}
+{9}DECLARE{0} {7}@MyCounter{15} {10}INT{5};{0}
+
+{2}-- Initialize the variable.{0}
+{9}SET{0} {7}@MyCounter{15} {5}={0} {3}0{5};{0}
+{9}WHILE{0} {5}({7}@MyCounter{15} {5}<{0} {3}26{5}){0}
+{9}BEGIN{5};{0}
+   {2}-- Insert a row into the table.{0}
+   {9}INSERT{0} {9}INTO{0} {6}TestTable{15} {9}VALUES{0}
+       {2}-- Use the variable to provide the integer value{0}
+       {2}-- for cola. Also use it to generate a unique letter{0}
+       {2}-- for each row. Use the ASCII function to get the{0}
+       {2}-- integer value of 'a'. Add @MyCounter. Use CHAR to{0}
+       {2}-- convert the sum back to the character @MyCounter{0}
+       {2}-- characters after 'a'.{0}
+       {5}({7}@MyCounter{5},{0}
+        {13}CHAR{5}({0} {5}({0} {7}@MyCounter{15} {5}+{0} {13}ASCII{5}({4}'a'{5}){0} {5}){0} {5}){0}
+       {5});{0}
+   {2}-- Increment the variable to count this iteration{0}
+   {2}-- of the loop.{0}
+   {9}SET{0} {7}@MyCounter{15} {5}={0} {7}@MyCounter{15} {5}+{0} {3}1{5};{0}
+{9}END{5};{0}
+
+{9}IF{0} {12}@@ERROR{0} {5}={0} {3}547{0}
+    {9}BEGIN{0}
+    {9}PRINT{0} {6}N{4}'A check constraint violation occurred.'{5};{0}
+    {9}END{0}
+{9}GO{0}
+
+{9}USE{0} {16}[AllStyles]{5}.{16}[dbo]{5}.{16}[test]{15}
+{9}GO{0}
+
+{9}SELECT{0} {6}ProductID{15}
+{9}FROM{0} {6}Production.Product{15}
+{5}INTERSECT{0}
+{9}SELECT{0} {6}ProductID{15}
+{9}FROM{0} {6}Production.WorkOrder{15} {5};{0}
diff --git a/lexilla/test/examples/powershell/Pull92.ps1 b/lexilla/test/examples/powershell/Pull92.ps1
new file mode 100644
index 000000000..deff41a78
--- /dev/null
+++ b/lexilla/test/examples/powershell/Pull92.ps1
@@ -0,0 +1,9 @@
+<# Tests for PowerShell #>
+
+<# Backticks should escape in double quoted strings #>
+$double_quote_str_esc_1 = "`"XXX`""
+$double_quote_str_esc_2 = "This `"string`" `$useses `r`n Backticks '``'"
+
+<# Backticks should be ignored in quoted strings #>
+$single_quote_str_esc_1 = 'XXX`'
+$single_quote_str_esc_2 = 'XXX```'
diff --git a/lexilla/test/examples/powershell/Pull92.ps1.folded b/lexilla/test/examples/powershell/Pull92.ps1.folded
new file mode 100644
index 000000000..23d1883d2
--- /dev/null
+++ b/lexilla/test/examples/powershell/Pull92.ps1.folded
@@ -0,0 +1,10 @@
+ 0 400 400   <# Tests for PowerShell #>
+ 1 400 400   
+ 0 400 400   <# Backticks should escape in double quoted strings #>
+ 0 400 400   $double_quote_str_esc_1 = "`"XXX`""
+ 0 400 400   $double_quote_str_esc_2 = "This `"string`" `$useses `r`n Backticks '``'"
+ 1 400 400   
+ 0 400 400   <# Backticks should be ignored in quoted strings #>
+ 0 400 400   $single_quote_str_esc_1 = 'XXX`'
+ 0 400 400   $single_quote_str_esc_2 = 'XXX```'
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/powershell/Pull92.ps1.styled b/lexilla/test/examples/powershell/Pull92.ps1.styled
new file mode 100644
index 000000000..acd73e4e0
--- /dev/null
+++ b/lexilla/test/examples/powershell/Pull92.ps1.styled
@@ -0,0 +1,9 @@
+{13}<# Tests for PowerShell #>{0}
+
+{13}<# Backticks should escape in double quoted strings #>{0}
+{5}$double_quote_str_esc_1{0} {6}={0} {2}"`"XXX`""{0}
+{5}$double_quote_str_esc_2{0} {6}={0} {2}"This `"string`" `$useses `r`n Backticks '``'"{0}
+
+{13}<# Backticks should be ignored in quoted strings #>{0}
+{5}$single_quote_str_esc_1{0} {6}={0} {3}'XXX`'{0}
+{5}$single_quote_str_esc_2{0} {6}={0} {3}'XXX```'{0}
diff --git a/lexilla/test/examples/powershell/SciTE.properties b/lexilla/test/examples/powershell/SciTE.properties
new file mode 100644
index 000000000..e26f4f87b
--- /dev/null
+++ b/lexilla/test/examples/powershell/SciTE.properties
@@ -0,0 +1,7 @@
+lexer.*.ps1=powershell
+fold=1
+
+keywords.*.ps1=if else in local
+keywords2.*.ps1=write-host write-output
+keywords3.*.ps1=cd chdir cat
+keywords4.*.ps1=mkdir prompt
diff --git a/lexilla/test/examples/props/Issue96Folding.props b/lexilla/test/examples/props/Issue96Folding.props
new file mode 100644
index 000000000..c07060c9d
--- /dev/null
+++ b/lexilla/test/examples/props/Issue96Folding.props
@@ -0,0 +1,5 @@
+; comment
+[empty section]
+[normal section]
+@=default
+key=value
diff --git a/lexilla/test/examples/props/Issue96Folding.props.folded b/lexilla/test/examples/props/Issue96Folding.props.folded
new file mode 100644
index 000000000..0220dd4cf
--- /dev/null
+++ b/lexilla/test/examples/props/Issue96Folding.props.folded
@@ -0,0 +1,6 @@
+ 0 400   0   ; comment
+ 0 400   0   [empty section]
+ 2 400   0 + [normal section]
+ 0 401   0 | @=default
+ 0 401   0 | key=value
+ 0 401   0 | 
\ No newline at end of file
diff --git a/lexilla/test/examples/props/Issue96Folding.props.styled b/lexilla/test/examples/props/Issue96Folding.props.styled
new file mode 100644
index 000000000..7dc6e53cf
--- /dev/null
+++ b/lexilla/test/examples/props/Issue96Folding.props.styled
@@ -0,0 +1,5 @@
+{1}; comment
+{2}[empty section]
+[normal section]
+{4}@{0}=default
+{5}key{3}={0}value
diff --git a/lexilla/test/examples/props/SciTE.properties b/lexilla/test/examples/props/SciTE.properties
index b43906b65..7e07d1a1a 100644
--- a/lexilla/test/examples/props/SciTE.properties
+++ b/lexilla/test/examples/props/SciTE.properties
@@ -1,2 +1,3 @@
 lexer.*.session=props
+lexer.*.props=props
 fold=1
diff --git a/lexilla/test/examples/visualprolog/AllStyles.pl b/lexilla/test/examples/visualprolog/AllStyles.pl
new file mode 100644
index 000000000..79ec623f3
--- /dev/null
+++ b/lexilla/test/examples/visualprolog/AllStyles.pl
@@ -0,0 +1,57 @@
+% SCE_VISUALPROLOG_KEY_MAJOR (1)
+goal
+
+% SCE_VISUALPROLOG_KEY_MINOR (2)
+procedure
+
+% SCE_VISUALPROLOG_KEY_DIRECTIVE (3)
+#include
+
+% SCE_VISUALPROLOG_COMMENT_BLOCK (4)
+/**
+   SCE_VISUALPROLOG_COMMENT_KEY (6)
+   @detail
+   SCE_VISUALPROLOG_COMMENT_KEY_ERROR (7)
+   @unknown
+ /* SCE_VISUALPROLOG_IDENTIFIER (8)
+    SCE_VISUALPROLOG_VARIABLE (9)
+    SCE_VISUALPROLOG_ANONYMOUS (10)
+    SCE_VISUALPROLOG_NUMBER (11)
+    SCE_VISUALPROLOG_OPERATOR (12) */ */
+singleton -->
+    [S],
+    {
+        string_lower(S, L),
+        atom_codes(L, Bytes),
+        sort(0, @=<, Bytes, [95, _discard])
+    }.
+
+% SCE_VISUALPROLOG_COMMENT_LINE (5)
+% @detail
+% @unknown
+
+% SCE_VISUALPROLOG_STRING (16)
+"string"
+'string'
+% ISO Prolog back-quoted string
+`string`
+
+% SCE_VISUALPROLOG_STRING_ESCAPE (17)
+"\n"
+'\uAB12'
+
+% SCE_VISUALPROLOG_STRING_ESCAPE_ERROR (18)
+"\ "
+
+% SCE_VISUALPROLOG_STRING_EOL_OPEN (19)
+"open string
+
+% Not implemented for ISO/SWI-Prolog:
+% SCE_VISUALPROLOG_STRING_VERBATIM
+% SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL
+% SCE_VISUALPROLOG_STRING_VERBATIM_EOL
+@"verbatim string"
+@"""special"" verbatim string"
+@"multi-line
+  verbatim
+  string"
diff --git a/lexilla/test/examples/visualprolog/AllStyles.pl.folded b/lexilla/test/examples/visualprolog/AllStyles.pl.folded
new file mode 100644
index 000000000..d401adc7a
--- /dev/null
+++ b/lexilla/test/examples/visualprolog/AllStyles.pl.folded
@@ -0,0 +1,58 @@
+ 0 400 400   % SCE_VISUALPROLOG_KEY_MAJOR (1)
+ 0 400 400   goal
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_KEY_MINOR (2)
+ 0 400 400   procedure
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_KEY_DIRECTIVE (3)
+ 0 400 400   #include
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_COMMENT_BLOCK (4)
+ 0 400 400   /**
+ 0 400 400      SCE_VISUALPROLOG_COMMENT_KEY (6)
+ 0 400 400      @detail
+ 0 400 400      SCE_VISUALPROLOG_COMMENT_KEY_ERROR (7)
+ 0 400 400      @unknown
+ 0 400 400    /* SCE_VISUALPROLOG_IDENTIFIER (8)
+ 0 400 400       SCE_VISUALPROLOG_VARIABLE (9)
+ 0 400 400       SCE_VISUALPROLOG_ANONYMOUS (10)
+ 0 400 400       SCE_VISUALPROLOG_NUMBER (11)
+ 0 400 400       SCE_VISUALPROLOG_OPERATOR (12) */ */
+ 0 400 400   singleton -->
+ 0 400 400       [S],
+ 2 400 401 +     {
+ 0 401 401 |         string_lower(S, L),
+ 0 401 401 |         atom_codes(L, Bytes),
+ 0 401 401 |         sort(0, @=<, Bytes, [95, _discard])
+ 0 401 400 |     }.
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_COMMENT_LINE (5)
+ 0 400 400   % @detail
+ 0 400 400   % @unknown
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_STRING (16)
+ 0 400 400   "string"
+ 0 400 400   'string'
+ 0 400 400   % ISO Prolog back-quoted string
+ 0 400 400   `string`
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_STRING_ESCAPE (17)
+ 0 400 400   "\n"
+ 0 400 400   '\uAB12'
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_STRING_ESCAPE_ERROR (18)
+ 0 400 400   "\ "
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_STRING_EOL_OPEN (19)
+ 0 400 400   "open string
+ 0 400 400   
+ 0 400 400   % Not implemented for ISO/SWI-Prolog:
+ 0 400 400   % SCE_VISUALPROLOG_STRING_VERBATIM
+ 0 400 400   % SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL
+ 0 400 400   % SCE_VISUALPROLOG_STRING_VERBATIM_EOL
+ 0 400 400   @"verbatim string"
+ 0 400 400   @"""special"" verbatim string"
+ 0 400 400   @"multi-line
+ 0 400 400     verbatim
+ 0 400 400     string"
+ 1 400 400   
\ No newline at end of file
diff --git a/lexilla/test/examples/visualprolog/AllStyles.pl.styled b/lexilla/test/examples/visualprolog/AllStyles.pl.styled
new file mode 100644
index 000000000..27e2b1e76
--- /dev/null
+++ b/lexilla/test/examples/visualprolog/AllStyles.pl.styled
@@ -0,0 +1,57 @@
+{5}% SCE_VISUALPROLOG_KEY_MAJOR (1){0}
+{1}goal{0}
+
+{5}% SCE_VISUALPROLOG_KEY_MINOR (2){0}
+{2}procedure{0}
+
+{5}% SCE_VISUALPROLOG_KEY_DIRECTIVE (3){0}
+{3}#include{0}
+
+{5}% SCE_VISUALPROLOG_COMMENT_BLOCK (4){0}
+{4}/**
+   SCE_VISUALPROLOG_COMMENT_KEY (6)
+   {6}@detail{4}
+   SCE_VISUALPROLOG_COMMENT_KEY_ERROR (7)
+   {7}@unknown{4}
+ /* SCE_VISUALPROLOG_IDENTIFIER (8)
+    SCE_VISUALPROLOG_VARIABLE (9)
+    SCE_VISUALPROLOG_ANONYMOUS (10)
+    SCE_VISUALPROLOG_NUMBER (11)
+    SCE_VISUALPROLOG_OPERATOR (12) */ */{0}
+{8}singleton{0} {12}-->{0}
+    {12}[{9}S{12}],{0}
+    {12}{{0}
+        {1}string_lower{12}({9}S{12},{0} {9}L{12}),{0}
+        {1}atom_codes{12}({9}L{12},{0} {9}Bytes{12}),{0}
+        {1}sort{12}({11}0{12},{0} {12}@=<,{0} {9}Bytes{12},{0} {12}[{11}95{12},{0} {10}_discard{12}]){0}
+    {12}}.{0}
+
+{5}% SCE_VISUALPROLOG_COMMENT_LINE (5){0}
+{5}% {6}@detail{0}
+{5}% {7}@unknown{0}
+
+{5}% SCE_VISUALPROLOG_STRING (16){0}
+{16}"string"{0}
+{16}'string'{0}
+{5}% ISO Prolog back-quoted string{0}
+{16}`string`{0}
+
+{5}% SCE_VISUALPROLOG_STRING_ESCAPE (17){0}
+{16}"{17}\n{16}"{0}
+{16}'{17}\uAB12{16}'{0}
+
+{5}% SCE_VISUALPROLOG_STRING_ESCAPE_ERROR (18){0}
+{16}"{18}\ {16}"{0}
+
+{5}% SCE_VISUALPROLOG_STRING_EOL_OPEN (19){0}
+{16}"open string{19}
+{0}
+{5}% Not implemented for ISO/SWI-Prolog:{0}
+{5}% SCE_VISUALPROLOG_STRING_VERBATIM{0}
+{5}% SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL{0}
+{5}% SCE_VISUALPROLOG_STRING_VERBATIM_EOL{0}
+{12}@{16}"verbatim string"{0}
+{12}@{16}"""special"" verbatim string"{0}
+{12}@{16}"multi-line{19}
+{0}  {8}verbatim{0}
+  {8}string{16}"{19}
diff --git a/lexilla/test/examples/visualprolog/AllStyles.pro b/lexilla/test/examples/visualprolog/AllStyles.pro
new file mode 100644
index 000000000..33841550e
--- /dev/null
+++ b/lexilla/test/examples/visualprolog/AllStyles.pro
@@ -0,0 +1,52 @@
+% SCE_VISUALPROLOG_KEY_MAJOR (1)
+goal
+
+% SCE_VISUALPROLOG_KEY_MINOR (2)
+procedure
+
+% SCE_VISUALPROLOG_KEY_DIRECTIVE (3)
+#include
+
+% SCE_VISUALPROLOG_COMMENT_BLOCK (4)
+/**
+   SCE_VISUALPROLOG_COMMENT_KEY (6)
+   @detail
+   SCE_VISUALPROLOG_COMMENT_KEY_ERROR (7)
+   @unknown
+ /* SCE_VISUALPROLOG_IDENTIFIER (8)
+    SCE_VISUALPROLOG_VARIABLE (9)
+    SCE_VISUALPROLOG_ANONYMOUS (10)
+    SCE_VISUALPROLOG_NUMBER (11)
+    SCE_VISUALPROLOG_OPERATOR (12) */ */
+lambda = {
+  (A) = { (B, _discard) = A*B+1 }
+}.
+
+% SCE_VISUALPROLOG_COMMENT_LINE (5)
+% @detail
+% @unknown
+
+% SCE_VISUALPROLOG_STRING (16)
+"string"
+'string'
+
+% SCE_VISUALPROLOG_STRING_ESCAPE (17)
+"\n"
+'\uAB12'
+
+% SCE_VISUALPROLOG_STRING_ESCAPE_ERROR (18)
+"\ "
+
+% SCE_VISUALPROLOG_STRING_EOL_OPEN (19)
+"open string
+
+% SCE_VISUALPROLOG_STRING_VERBATIM (20)
+@"verbatim string"
+
+% SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL (21)
+@"""special"" verbatim string"
+
+% SCE_VISUALPROLOG_STRING_VERBATIM_EOL (22)
+@"multi-line
+  verbatim
+  string"
diff --git a/lexilla/test/examples/visualprolog/AllStyles.pro.folded b/lexilla/test/examples/visualprolog/AllStyles.pro.folded
new file mode 100644
index 000000000..465365529
--- /dev/null
+++ b/lexilla/test/examples/visualprolog/AllStyles.pro.folded
@@ -0,0 +1,53 @@
+ 0 400 400   % SCE_VISUALPROLOG_KEY_MAJOR (1)
+ 0 400 400   goal
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_KEY_MINOR (2)
+ 0 400 400   procedure
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_KEY_DIRECTIVE (3)
+ 0 400 400   #include
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_COMMENT_BLOCK (4)
+ 0 400 400   /**
+ 0 400 400      SCE_VISUALPROLOG_COMMENT_KEY (6)
+ 0 400 400      @detail
+ 0 400 400      SCE_VISUALPROLOG_COMMENT_KEY_ERROR (7)
+ 0 400 400      @unknown
+ 0 400 400    /* SCE_VISUALPROLOG_IDENTIFIER (8)
+ 0 400 400       SCE_VISUALPROLOG_VARIABLE (9)
+ 0 400 400       SCE_VISUALPROLOG_ANONYMOUS (10)
+ 0 400 400       SCE_VISUALPROLOG_NUMBER (11)
+ 0 400 400       SCE_VISUALPROLOG_OPERATOR (12) */ */
+ 2 400 401 + lambda = {
+ 0 401 401 |   (A) = { (B, _discard) = A*B+1 }
+ 0 401 400 | }.
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_COMMENT_LINE (5)
+ 0 400 400   % @detail
+ 0 400 400   % @unknown
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_STRING (16)
+ 0 400 400   "string"
+ 0 400 400   'string'
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_STRING_ESCAPE (17)
+ 0 400 400   "\n"
+ 0 400 400   '\uAB12'
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_STRING_ESCAPE_ERROR (18)
+ 0 400 400   "\ "
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_STRING_EOL_OPEN (19)
+ 0 400 400   "open string
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_STRING_VERBATIM (20)
+ 0 400 400   @"verbatim string"
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL (21)
+ 0 400 400   @"""special"" verbatim string"
+ 0 400 400   
+ 0 400 400   % SCE_VISUALPROLOG_STRING_VERBATIM_EOL (22)
+ 0 400 400   @"multi-line
+ 0 400 400     verbatim
+ 0 400 400     string"
+ 1 400 400   
\ No newline at end of file
diff --git a/lexilla/test/examples/visualprolog/AllStyles.pro.styled b/lexilla/test/examples/visualprolog/AllStyles.pro.styled
new file mode 100644
index 000000000..81f040220
--- /dev/null
+++ b/lexilla/test/examples/visualprolog/AllStyles.pro.styled
@@ -0,0 +1,52 @@
+{5}% SCE_VISUALPROLOG_KEY_MAJOR (1){0}
+{1}goal{0}
+
+{5}% SCE_VISUALPROLOG_KEY_MINOR (2){0}
+{2}procedure{0}
+
+{5}% SCE_VISUALPROLOG_KEY_DIRECTIVE (3){0}
+{3}#include{0}
+
+{5}% SCE_VISUALPROLOG_COMMENT_BLOCK (4){0}
+{4}/**
+   SCE_VISUALPROLOG_COMMENT_KEY (6)
+   {6}@detail{4}
+   SCE_VISUALPROLOG_COMMENT_KEY_ERROR (7)
+   {7}@unknown{4}
+ /* SCE_VISUALPROLOG_IDENTIFIER (8)
+    SCE_VISUALPROLOG_VARIABLE (9)
+    SCE_VISUALPROLOG_ANONYMOUS (10)
+    SCE_VISUALPROLOG_NUMBER (11)
+    SCE_VISUALPROLOG_OPERATOR (12) */ */{0}
+{8}lambda{0} {12}={0} {12}{{0}
+  {12}({9}A{12}){0} {12}={0} {12}{{0} {12}({9}B{12},{0} {10}_discard{12}){0} {12}={0} {9}A{12}*{9}B{12}+{11}1{0} {12}}{0}
+{12}}.{0}
+
+{5}% SCE_VISUALPROLOG_COMMENT_LINE (5){0}
+{5}% {6}@detail{0}
+{5}% {7}@unknown{0}
+
+{5}% SCE_VISUALPROLOG_STRING (16){0}
+{16}"string"{0}
+{16}'string'{0}
+
+{5}% SCE_VISUALPROLOG_STRING_ESCAPE (17){0}
+{16}"{17}\n{16}"{0}
+{16}'{17}\uAB12{16}'{0}
+
+{5}% SCE_VISUALPROLOG_STRING_ESCAPE_ERROR (18){0}
+{16}"{18}\ {16}"{0}
+
+{5}% SCE_VISUALPROLOG_STRING_EOL_OPEN (19){0}
+{16}"open string{19}
+{0}
+{5}% SCE_VISUALPROLOG_STRING_VERBATIM (20){0}
+{20}@"verbatim string"{0}
+
+{5}% SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL (21){0}
+{20}@"{21}""{20}special{21}""{20} verbatim string"{0}
+
+{5}% SCE_VISUALPROLOG_STRING_VERBATIM_EOL (22){0}
+{20}@"multi-line{22}
+{20}  verbatim{22}
+{20}  string"{0}
diff --git a/lexilla/test/examples/visualprolog/SciTE.properties b/lexilla/test/examples/visualprolog/SciTE.properties
new file mode 100644
index 000000000..dec02bc9d
--- /dev/null
+++ b/lexilla/test/examples/visualprolog/SciTE.properties
@@ -0,0 +1,29 @@
+lexer.*.pro;*.pl=visualprolog
+fold=1
+
+# Visual Prolog properties
+match AllStyles.pro
+  lexer.visualprolog.verbatim.strings=1
+  lexer.visualprolog.backquoted.strings=0
+
+# ISO/SWI-Prolog properties
+match AllStyles.pl
+  lexer.visualprolog.verbatim.strings=0
+  lexer.visualprolog.backquoted.strings=1
+
+# major keywords
+keywords.*.pro;*.pl=goal namespace interface class implement open inherits supports resolve delegate \
+monitor constants domains predicates constructors properties clauses facts string_lower atom_codes sort
+
+# minor keywords
+keywords2.*.pro;*.pl=any binary binaryNonAtomic boolean char compareResult factDB guard handle integer64 \
+integerNative language null pointer real real32 stdcall string8 symbol apicall c thiscall prolog \
+digits if then elseif else endif foreach do try catch finally erroneous failure procedure determ multi \
+nondeterm anyflow and or externally from div mod rem quot in orelse otherwise unsigned unsigned64 \
+unsignedNative
+
+# directives
+keywords3.*.pro;*.pl=include bininclude requires orrequires error message export externally options
+
+# documentation keywords
+keywords4.*.pro;*.pl=short detail end exception withdomain
diff --git a/lexilla/version.txt b/lexilla/version.txt
index c047c4aba..82cf07969 100644
--- a/lexilla/version.txt
+++ b/lexilla/version.txt
@@ -1 +1 @@
-518
\ No newline at end of file
+519
\ No newline at end of file
diff --git a/scintilla/call/ScintillaCall.cxx b/scintilla/call/ScintillaCall.cxx
index 20fb452da..1f496c53d 100644
--- a/scintilla/call/ScintillaCall.cxx
+++ b/scintilla/call/ScintillaCall.cxx
@@ -1151,6 +1151,14 @@ Position ScintillaCall::FormatRangeFull(bool draw, void *fr) {
 	return CallPointer(Message::FormatRangeFull, draw, fr);
 }
 
+void ScintillaCall::SetChangeHistory(Scintilla::ChangeHistoryOption changeHistory) {
+	Call(Message::SetChangeHistory, static_cast<uintptr_t>(changeHistory));
+}
+
+ChangeHistoryOption ScintillaCall::ChangeHistory() {
+	return static_cast<Scintilla::ChangeHistoryOption>(Call(Message::GetChangeHistory));
+}
+
 Line ScintillaCall::FirstVisibleLine() {
 	return Call(Message::GetFirstVisibleLine);
 }
@@ -1215,6 +1223,10 @@ void ScintillaCall::HideSelection(bool hide) {
 	Call(Message::HideSelection, hide);
 }
 
+bool ScintillaCall::SelectionHidden() {
+	return Call(Message::GetSelectionHidden);
+}
+
 int ScintillaCall::PointXFromPosition(Position pos) {
 	return static_cast<int>(Call(Message::PointXFromPosition, 0, pos));
 }
diff --git a/scintilla/cocoa/Scintilla/Info.plist b/scintilla/cocoa/Scintilla/Info.plist
index 7e4119fc7..e4bc4369b 100644
--- a/scintilla/cocoa/Scintilla/Info.plist
+++ b/scintilla/cocoa/Scintilla/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.2.4</string>
+	<string>5.3.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj b/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
index 5a29a5c58..67b90d7e9 100644
--- a/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
+++ b/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2807B4EA28964CA40063A31A /* ChangeHistory.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 2807B4E828964CA40063A31A /* ChangeHistory.cxx */; };
+		2807B4EB28964CA40063A31A /* ChangeHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = 2807B4E928964CA40063A31A /* ChangeHistory.h */; };
 		282936DF24E2D55D00C84BA2 /* QuartzTextLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936D324E2D55D00C84BA2 /* QuartzTextLayout.h */; };
 		282936E024E2D55D00C84BA2 /* InfoBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = 282936D424E2D55D00C84BA2 /* InfoBar.mm */; };
 		282936E124E2D55D00C84BA2 /* QuartzTextStyleAttribute.h in Headers */ = {isa = PBXBuildFile; fileRef = 282936D524E2D55D00C84BA2 /* QuartzTextStyleAttribute.h */; };
@@ -103,6 +105,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		2807B4E828964CA40063A31A /* ChangeHistory.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChangeHistory.cxx; path = ../../src/ChangeHistory.cxx; sourceTree = "<group>"; };
+		2807B4E928964CA40063A31A /* ChangeHistory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChangeHistory.h; path = ../../src/ChangeHistory.h; sourceTree = "<group>"; };
 		282936D324E2D55D00C84BA2 /* QuartzTextLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuartzTextLayout.h; path = ../QuartzTextLayout.h; sourceTree = "<group>"; };
 		282936D424E2D55D00C84BA2 /* InfoBar.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = InfoBar.mm; path = ../InfoBar.mm; sourceTree = "<group>"; };
 		282936D524E2D55D00C84BA2 /* QuartzTextStyleAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QuartzTextStyleAttribute.h; path = ../QuartzTextStyleAttribute.h; sourceTree = "<group>"; };
@@ -246,6 +250,8 @@
 				2829372524E2D58700C84BA2 /* CaseFolder.h */,
 				2829372624E2D58700C84BA2 /* CellBuffer.cxx */,
 				2829371924E2D58600C84BA2 /* CellBuffer.h */,
+				2807B4E828964CA40063A31A /* ChangeHistory.cxx */,
+				2807B4E928964CA40063A31A /* ChangeHistory.h */,
 				28EA9CAA255894B4007710C4 /* CharacterCategoryMap.cxx */,
 				28EA9CAC255894B4007710C4 /* CharacterCategoryMap.h */,
 				28EA9CAB255894B4007710C4 /* CharacterType.cxx */,
@@ -404,6 +410,7 @@
 				282936E224E2D55D00C84BA2 /* ScintillaCocoa.h in Headers */,
 				2829373524E2D58800C84BA2 /* Style.h in Headers */,
 				282936E424E2D55D00C84BA2 /* PlatCocoa.h in Headers */,
+				2807B4EB28964CA40063A31A /* ChangeHistory.h in Headers */,
 				2829376C24E2D58800C84BA2 /* Selection.h in Headers */,
 				2829376124E2D58800C84BA2 /* ScintillaBase.h in Headers */,
 				2829373824E2D58800C84BA2 /* RESearch.h in Headers */,
@@ -504,6 +511,7 @@
 				2829375524E2D58800C84BA2 /* EditModel.cxx in Sources */,
 				2829375124E2D58800C84BA2 /* ContractionState.cxx in Sources */,
 				2829374924E2D58800C84BA2 /* CallTip.cxx in Sources */,
+				2807B4EA28964CA40063A31A /* ChangeHistory.cxx in Sources */,
 				2829375824E2D58800C84BA2 /* CharClassify.cxx in Sources */,
 				2829373324E2D58800C84BA2 /* LineMarker.cxx in Sources */,
 				2829374E24E2D58800C84BA2 /* KeyMap.cxx in Sources */,
@@ -565,7 +573,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5.2.4;
+				CURRENT_PROJECT_VERSION = 5.3.0;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -627,7 +635,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5.2.4;
+				CURRENT_PROJECT_VERSION = 5.3.0;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -657,7 +665,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5.2.4;
+				CURRENT_PROJECT_VERSION = 5.3.0;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -691,7 +699,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5.2.4;
+				CURRENT_PROJECT_VERSION = 5.3.0;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
diff --git a/scintilla/cocoa/ScintillaCocoa.mm b/scintilla/cocoa/ScintillaCocoa.mm
index 7f256f1d2..30f261aa3 100644
--- a/scintilla/cocoa/ScintillaCocoa.mm
+++ b/scintilla/cocoa/ScintillaCocoa.mm
@@ -1457,8 +1457,8 @@ void ScintillaCocoa::StartDrag() {
 	si.SetMode(CurrentSurfaceMode());
 	std::unique_ptr<SurfaceImpl> sw = si.AllocatePixMapImplementation(static_cast<int>(client.Width()), static_cast<int>(client.Height()));
 
-	const bool lastHideSelection = view.hideSelection;
-	view.hideSelection = true;
+	const bool lastSelectionVisible = vs.selection.visible;
+	vs.selection.visible = false;
 	PRectangle imageRect = rcSel;
 	paintState = PaintState::painting;
 	paintingAllText = true;
@@ -1466,7 +1466,7 @@ void ScintillaCocoa::StartDrag() {
 	CGContextTranslateCTM(gcsw, -client.left, -client.top);
 	Paint(sw.get(), client);
 	paintState = PaintState::notPainting;
-	view.hideSelection = lastHideSelection;
+	vs.selection.visible = lastSelectionVisible;
 
 	std::unique_ptr<SurfaceImpl> pixmap = si.AllocatePixMapImplementation(static_cast<int>(imageRect.Width()),
 								  static_cast<int>(imageRect.Height()));
diff --git a/scintilla/doc/ChangeHistory.png b/scintilla/doc/ChangeHistory.png
new file mode 100644
index 000000000..fbde9a499
Binary files /dev/null and b/scintilla/doc/ChangeHistory.png differ
diff --git a/scintilla/doc/Indicators.png b/scintilla/doc/Indicators.png
index 541e3de62..0b902ae1b 100644
Binary files a/scintilla/doc/Indicators.png and b/scintilla/doc/Indicators.png differ
diff --git a/scintilla/doc/Markers.png b/scintilla/doc/Markers.png
index b1d0120c0..3db13c341 100644
Binary files a/scintilla/doc/Markers.png and b/scintilla/doc/Markers.png differ
diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html
index 051f95350..487b7e084 100644
--- a/scintilla/doc/ScintillaDoc.html
+++ b/scintilla/doc/ScintillaDoc.html
@@ -129,7 +129,7 @@
 
     <h1>Scintilla Documentation</h1>
 
-    <p>Last edited 15 May 2022 NH</p>
+    <p>Last edited 26 August 2022 NH</p>
 
     <p style="background:#90F0C0">Scintilla 5 has moved the lexers from Scintilla into a new
     <a href="Lexilla.html">Lexilla</a> project.<br />
@@ -345,149 +345,139 @@
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#ChangeHistory">Change history</a></td>
+
           <td>&cir; <a class="toc" href="#SelectionAndInformation">Selection and information</a></td>
 
           <td>&cir; <a class="toc" href="#ByCharacterOrCodeUnit">By character or UTF-16 code unit</a></td>
 
-          <td>&cir; <a class="toc" href="#MultipleSelectionAndVirtualSpace">Multiple Selection and Virtual Space</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#MultipleSelectionAndVirtualSpace">Multiple Selection and Virtual Space</a></td>
+
           <td>&cir; <a class="toc" href="#ScrollingAndAutomaticScrolling">Scrolling and automatic scrolling</a></td>
 
           <td>&cir; <a class="toc" href="#WhiteSpace">White space</a></td>
-
-          <td>&cir; <a class="toc" href="#Cursor">Cursor</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#Cursor">Cursor</a></td>
+
           <td>&cir; <a class="toc" href="#MouseCapture">Mouse capture</a></td>
 
           <td>&cir; <a class="toc" href="#LineEndings">Line endings</a></td>
 
-          <td>&cir; <a class="toc" href="#Words">Words</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#Words">Words</a></td>
+
           <td>&cir; <a class="toc" href="#Styling">Styling</a></td>
 
           <td>&cir; <a class="toc" href="#StyleDefinition">Style definition</a></td>
-
-          <td>&cir; <a class="toc" href="#ElementColours">Element colours</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#ElementColours">Element colours</a></td>
+
           <td>&cir; <a class="toc" href="#CaretAndSelectionStyles">Selection, caret, and hotspot styles</a></td>
 
           <td>&cir; <a class="toc" href="#CharacterRepresentations">Character representations</a></td>
-
-          <td>&cir; <a class="toc" href="#Margins">Margins</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#Margins">Margins</a></td>
+
           <td>&cir; <a class="toc" href="#Annotations">Annotations</a></td>
 
           <td>&cir; <a class="toc" href="#OtherSettings">Other settings</a></td>
-
-          <td>&cir; <a class="toc" href="#BraceHighlighting">Brace highlighting</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#BraceHighlighting">Brace highlighting</a></td>
+
           <td>&cir; <a class="toc" href="#TabsAndIndentationGuides">Tabs and Indentation
           Guides</a></td>
 
           <td>&cir; <a class="toc" href="#Markers">Markers</a></td>
-
-          <td>&cir; <a class="toc" href="#Indicators">Indicators</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#Indicators">Indicators</a></td>
+
           <td>&cir; <a class="toc" href="#Autocompletion">Autocompletion</a></td>
 
           <td>&cir; <a class="toc" href="#UserLists">User lists</a></td>
-
-          <td>&cir; <a class="toc" href="#CallTips">Call tips</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#CallTips">Call tips</a></td>
+
           <td>&cir; <a class="toc" href="#KeyboardCommands">Keyboard commands</a></td>
 
           <td>&cir; <a class="toc" href="#KeyBindings">Key bindings</a></td>
-
-          <td>&cir; <a class="toc" href="#PopupEditMenu">Popup edit menu</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#PopupEditMenu">Popup edit menu</a></td>
+
           <td>&cir; <a class="toc" href="#MacroRecording">Macro recording</a></td>
 
           <td>&cir; <a class="toc" href="#Printing">Printing</a></td>
-
-          <td>&cir; <a class="toc" href="#DirectAccess">Direct access</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#DirectAccess">Direct access</a></td>
+
           <td>&cir; <a class="toc" href="#MultipleViews">Multiple views</a></td>
 
           <td>&cir; <a class="toc" href="#BackgroundLoadSave">Background loading and saving</a></td>
-
-          <td>&cir; <a class="toc" href="#Folding">Folding</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#Folding">Folding</a></td>
+
           <td>&cir; <a class="toc" href="#LineWrapping">Line wrapping</a></td>
 
           <td>&cir; <a class="toc" href="#Zooming">Zooming</a></td>
-
-          <td>&cir; <a class="toc" href="#LongLines">Long lines</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#LongLines">Long lines</a></td>
+
           <td>&cir; <a class="toc" href="#Accessibility">Accessibility</a></td>
 
           <td>&cir; <a class="toc" href="#Lexer">Lexer</a></td>
-
-          <td>&cir; <a class="toc" href="#LexerObjects">Lexer objects</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#LexerObjects">Lexer objects</a></td>
+
           <td>&cir; <a class="toc" href="#Notifications">Notifications</a></td>
 
           <td>&cir; <a class="toc" href="#Images">Images</a></td>
-
-          <td>&cir; <a class="toc" href="#GTK">GTK</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#GTK">GTK</a></td>
+
           <td>&cir; <a class="toc" href="#ProvisionalMessages"><span class="provisional">Provisional messages</span></a></td>
 
           <td>&cir; <a class="toc" href="#DeprecatedMessages">Deprecated messages</a></td>
-
-          <td>&cir; <a class="toc" href="#EditMessagesNeverSupportedByScintilla">Edit messages never
-          supported by Scintilla</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#EditMessagesNeverSupportedByScintilla">Edit messages never
+          supported by Scintilla</a></td>
+
           <td>&cir; <a class="toc" href="#RemovedFeatures">Removed features</a></td>
 
           <td>&cir; <a class="toc" href="#BuildingScintilla">Building Scintilla</a></td>
+        </tr>
 
+        <tr>
           <td>&cir; <a class="toc" href="#EndOfLineAnnotations">End of Line Annotations</a></td>
-
         </tr>
       </tbody>
     </table>
@@ -1063,7 +1053,7 @@ struct Sci_TextRangeFull {
     </code>
 
     <p><b id="SCI_FINDTEXT">SCI_FINDTEXT(int searchFlags, <a class="jump" href="#Sci_TextToFind">Sci_TextToFind</a> *ft) &rarr; position</b><br />
-     <b id="SCI_FINDTEXT">SCI_FINDTEXTFULL(int searchFlags, <a class="jump" href="#Sci_TextToFindFull">Sci_TextToFindFull</a> *ft) &rarr; position</b><br />
+     <b id="SCI_FINDTEXTFULL">SCI_FINDTEXTFULL(int searchFlags, <a class="jump" href="#Sci_TextToFindFull">Sci_TextToFindFull</a> *ft) &rarr; position</b><br />
      These messages search for text in the document. They do not use or move the current selection.
     The <a class="jump" href="#searchFlags"><code class="parameter">searchFlags</code></a> argument controls the
     search type, which includes regular expression searches.</p>
@@ -1343,6 +1333,173 @@ struct Sci_TextToFindFull {
      Coalescing treats coalescible container actions as transparent so will still only group together insertions that
      look like typing or deletions that look like multiple uses of the Backspace or Delete keys.
      </p>
+     
+    <h2 id="ChangeHistory">Change history</h2>
+
+    <p>Scintilla can display document changes (modified, saved, ...) in the margin or in the text.</p>
+
+    <p><img src="ChangeHistory.png" alt="Change history markers and indicators." /></p>
+
+    <p>The image shows the default visuals which can be altered by the application.
+    In the text, inserted characters appear with coloured underlines and points where characters were deleted are shown with small triangles.
+    The margin shows a block indicating the overall state of the line, prioritising the more consequential modified states.
+    The states are
+    modified (<span style="color:#FF8000">orange</span>),
+    saved (<span style="color:#00A000">green</span>),
+    saved then reverted to modified (<span style="color:#A0C000">green-yellow</span>),
+    and saved then reverted to original (<span style="color:#40A0BF">cyan</span>).
+    </p>
+
+    <p>This feature uses a moderate amount of memory proportional to the amount of modifications made.
+    On huge documents, this could be significant so could be disabled when it would cause excessive memory use.</p>
+
+    <code><a class="message" href="#SCI_SETCHANGEHISTORY">SCI_SETCHANGEHISTORY(int changeHistory)</a><br />
+     <a class="message" href="#SCI_GETCHANGEHISTORY">SCI_GETCHANGEHISTORY &rarr; int</a><br />
+    </code>
+
+    <p><b id="SCI_SETCHANGEHISTORY">SCI_SETCHANGEHISTORY(int changeHistory)</b><br />
+     <b id="SCI_GETCHANGEHISTORY">SCI_GETCHANGEHISTORY &rarr; int</b><br />
+     <code>SCI_SETCHANGEHISTORY</code> turns this feature on and off and determines whether changes are visible in
+     the margin or text or both.</p>
+     <p>Change history depends on the undo history and can only be enabled when undo history is enabled and empty.
+     It should be enabled once when a file is loaded after calling
+     <a class="seealso" href="#SCI_SETUNDOCOLLECTION">SCI_SETUNDOCOLLECTION(true)</a> and
+     <a class="seealso" href="#SCI_SETSAVEPOINT">SCI_SETSAVEPOINT</a>.</p>
+     <p>The <code class="parameter">changeHistory</code> argument can be a combination of:</p>
+
+    <table class="standard" summary="Change history state">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>SC_CHANGE_HISTORY_DISABLED</code></th>
+
+          <td>0</td>
+
+          <td>The default: change history turned off.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_CHANGE_HISTORY_ENABLED</code></th>
+
+          <td>1</td>
+
+          <td>Track changes to the document.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_CHANGE_HISTORY_MARKERS</code></th>
+
+          <td>2</td>
+
+          <td>Display changes in the margin using the <code>SC_MARKNUM_HISTORY</code> markers.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_CHANGE_HISTORY_INDICATORS</code></th>
+
+          <td>4</td>
+
+          <td>Display changes in the text using the <code>INDICATOR_HISTORY</code> indicators.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>There are default visuals assigned to each history marker and indicator but these may be overridden by the application.</p>
+
+    <p>Markers:</p>
+
+    <table class="standard" summary="Change history markers">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>SC_MARKNUM_HISTORY_REVERTED_TO_ORIGIN</code></th>
+
+          <td>21</td>
+
+          <td>A change was made to this line and saved but then reverted to its original state.
+	  This line is different to its state on disk.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_MARKNUM_HISTORY_SAVED</code></th>
+
+          <td>22</td>
+
+          <td>This line was modified and saved. This line is the same as its state on disk.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_MARKNUM_HISTORY_MODIFIED</code></th>
+
+          <td>23</td>
+
+          <td>This line was modified but not yet saved. This line is different to its state on disk.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>SC_MARKNUM_HISTORY_REVERTED_TO_MODIFIED</code></th>
+
+          <td>24</td>
+
+          <td>A change was made to this line and saved but then reverted but not to its original state.
+	  This line is different to its state on disk.</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <p>Indicators:</p>
+
+    <table class="standard" summary="Change history indicators">
+      <tbody valign="top">
+        <tr>
+          <th align="left"><code>INDICATOR_HISTORY_REVERTED_TO_ORIGIN_INSERTION</code></th>
+          <td>36</td>
+          <td>Text was deleted and saved but then reverted to its original state.
+	  This text is not present on disk.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>INDICATOR_HISTORY_REVERTED_TO_ORIGIN_DELETION</code></th>
+          <td>37</td>
+          <td>Text was inserted and saved but then reverted to its original state.
+	  This range is different to its state on disk.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>INDICATOR_HISTORY_SAVED_INSERTION</code></th>
+          <td>38</td>
+          <td>Text was inserted and saved. This text is the same as on disk.</td>
+        </tr>
+        <tr>
+          <th align="left"><code>INDICATOR_HISTORY_SAVED_DELETION</code></th>
+          <td>39</td>
+          <td>Text was deleted and saved. This range is the same as on disk.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>INDICATOR_HISTORY_MODIFIED_INSERTION</code></th>
+          <td>40</td>
+          <td>Text was inserted but not yet saved. This text is not present on disk.</td>
+        </tr>
+        <tr>
+          <th align="left"><code>INDICATOR_HISTORY_MODIFIED_DELETION</code></th>
+          <td>41</td>
+          <td>Text was deleted but not yet saved. This range is different to its state on disk.</td>
+        </tr>
+
+        <tr>
+          <th align="left"><code>INDICATOR_HISTORY_REVERTED_TO_MODIFIED_INSERTION</code></th>
+          <td>42</td>
+          <td>Text was deleted and saved but then reverted but not to its original state.
+	  This text is not present on disk.</td>
+        </tr>
+        <tr>
+          <th align="left"><code>INDICATOR_HISTORY_REVERTED_TO_MODIFIED_DELETION</code></th>
+          <td>43</td>
+          <td>Text was inserted and saved but then reverted but not to its original state.
+	  This range is different to its state on disk.</td>
+        </tr>
+      </tbody>
+    </table>
+
     <h2 id="SelectionAndInformation">Selection and information</h2>
 
     <p>Scintilla maintains a selection that stretches between two points, the anchor and the
@@ -1382,6 +1539,7 @@ struct Sci_TextToFindFull {
      <a class="message" href="#SCI_POINTXFROMPOSITION">SCI_POINTXFROMPOSITION(&lt;unused&gt;, position pos) &rarr; int</a><br />
      <a class="message" href="#SCI_POINTYFROMPOSITION">SCI_POINTYFROMPOSITION(&lt;unused&gt;, position pos) &rarr; int</a><br />
      <a class="message" href="#SCI_HIDESELECTION">SCI_HIDESELECTION(bool hide)</a><br />
+     <a class="message" href="#SCI_GETSELECTIONHIDDEN">SCI_GETSELECTIONHIDDEN &rarr; bool</a><br />
      <a class="message" href="#SCI_GETSELTEXT">SCI_GETSELTEXT(&lt;unused&gt;, char *text) &rarr; position</a><br />
      <a class="message" href="#SCI_GETCURLINE">SCI_GETCURLINE(position length, char *text) &rarr; position</a><br />
      <a class="message" href="#SCI_SELECTIONISRECTANGLE">SCI_SELECTIONISRECTANGLE &rarr; bool</a><br />
@@ -1651,10 +1809,11 @@ struct Sci_TextToFindFull {
     in the document.</p>
 
     <p><b id="SCI_HIDESELECTION">SCI_HIDESELECTION(bool hide)</b><br />
+     <b id="SCI_GETSELECTIONHIDDEN">SCI_GETSELECTIONHIDDEN &rarr; bool</b><br />
      The normal state is to make the selection visible by drawing it as set by <a class="message"
-    href="#SCI_SETSELFORE"><code>SCI_SETSELFORE</code></a> and <a class="message"
-    href="#SCI_SETSELBACK"><code>SCI_SETSELBACK</code></a>. However, if you hide the selection, it
-    is drawn as normal text.</p>
+    href="#SCI_SETSELFORE"><code>SCI_SETSELFORE</code></a>, <a class="message"
+    href="#SCI_SETSELBACK"><code>SCI_SETSELBACK</code></a>, and related calls.
+    However, if you hide the selection, it is drawn as normal text.</p>
 
     <p><b id="SCI_CHOOSECARETX">SCI_CHOOSECARETX</b><br />
      Scintilla remembers the x value of the last position horizontally moved to explicitly by the
@@ -2900,7 +3059,9 @@ struct Sci_TextToFindFull {
     </p>
 
     <p><b id="SCI_GETMAXLINESTATE">SCI_GETMAXLINESTATE &rarr; int</b><br />
-     This returns the last line that has any line state.</p>
+     This returns the last line that has any line state.
+     This has been made less useful by an optimization that always allocates for all lines if any line's state was set.
+     It can still distinguish cases where line state was never set for any lines.</p>
 
     <h2 id="StyleDefinition">Style definition</h2>
 
@@ -4986,7 +5147,10 @@ struct Sci_TextToFindFull {
     Scintilla in folding margins, and have symbolic names of the form <code>SC_MARKNUM_</code>*,
     for example <code>SC_MARKNUM_FOLDEROPEN</code>.</p>
 
-    <p>Marker numbers 0 to 24 have no pre-defined function; you can use them to mark syntax errors
+    <p>Marker numbers 21 to 24 are used for <a class="jump" href="#ChangeHistory">Change history</a> if that is enabled but are
+    otherwise free for application use.</p>
+
+    <p>Marker numbers 0 to 20 have no pre-defined function; you can use them to mark syntax errors
     or the current point of execution, break points, or whatever you need marking. If you do not
     need folding, you can use all 32 for any purpose you wish.</p>
 
@@ -5055,8 +5219,9 @@ struct Sci_TextToFindFull {
     <code>SC_MARK_LEFTRECT</code>,
     <code>SC_MARK_FULLRECT</code>,
     <code>SC_MARK_BOOKMARK</code>,
-    <code>SC_MARK_VERTICALBOOKMARK</code>, and
-    <code>SC_MARK_UNDERLINE</code>.
+    <code>SC_MARK_VERTICALBOOKMARK</code>,
+    <code>SC_MARK_UNDERLINE</code>, and
+    <code>SC_MARK_BAR</code>.
     </p>
 
     <p>The <code>SC_MARK_BACKGROUND</code> marker changes the background colour of the line only.
@@ -5372,11 +5537,14 @@ struct Sci_TextToFindFull {
     They may also be invisible when used to track pieces of content for the application as <code>INDIC_HIDDEN</code>.</p>
 
     <p>The <code>SCI_INDIC*</code> messages allow you to get and set the visual appearance of the
-    indicators. They all use an <code class="parameter">indicator</code> argument in the range 0 to <code>INDICATOR_MAX</code>(35)
+    indicators. They all use an <code class="parameter">indicator</code> argument in the range 0 to <code>INDICATOR_MAX</code>(43)
     to set the indicator to style. To prevent interference the set of indicators is divided up into a range for use
     by lexers (0..7) a range for use by containers
     (8=<code>INDICATOR_CONTAINER</code> .. 31=<code>INDICATOR_IME-1</code>)
-    and a range for IME indicators (32=<code>INDICATOR_IME</code> .. 35=<code>INDICATOR_IME_MAX</code>).</p>
+    a range for IME indicators (32=<code>INDICATOR_IME</code> .. 35=<code>INDICATOR_IME_MAX</code>)
+    and a range for  <a class="jump" href="#ChangeHistory">Change history</a>
+    (36=<code>INDICATOR_HISTORY_REVERTED_TO_ORIGIN_INSERTION</code> ..
+    43=<code>INDICATOR_HISTORY_REVERTED_TO_MODIFIED_DELETION</code>).</p>
 
     <p>The <code>INDICATOR_*</code> values used for dividing up indicators
     were previously <code>INDIC_CONTAINER</code>, <code>INDIC_IME</code>,
@@ -5619,7 +5787,9 @@ struct Sci_TextToFindFull {
 
           <td>A 2-pixel thick underline located at the bottom of the line to try to avoid touching the character base.
 	  Each side is inset 1 pixel so that different indicators in this style covering a range appear isolated.
-	  This is similar to an appearance used for the target in Asian language input composition.</td>
+	  This is similar to an appearance used for the target in Asian language input composition.
+	  The translucency of this indicator can be changed with
+	  <a class="seealso" href="#SCI_INDICSETOUTLINEALPHA">SCI_INDICSETOUTLINEALPHA</a>.</td>
         </tr>
 
         <tr>
@@ -5656,6 +5826,14 @@ struct Sci_TextToFindFull {
           <td>Draw a triangle below the centre of the first character of the indicator range.</td>
         </tr>
 
+        <tr>
+          <td align="left"><code>INDIC_POINT_TOP</code></td>
+
+          <td align="center">22</td>
+
+          <td>Draw a triangle above the start of the indicator range..</td>
+        </tr>
+
       </tbody>
     </table>
 
@@ -7413,6 +7591,12 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
           <td align="left">Toggle between contracted and expanded.</td>
         </tr>
 
+        <tr>
+          <td align="left">SC_FOLDACTION_CONTRACT_EVERY_LEVEL</td>
+          <td align="left">4</td>
+          <td align="left">Used for SCI_FOLDALL only, can be combined with SC_FOLDACTION_CONTRACT or SC_FOLDACTION_TOGGLE to contract all levels instead of only top-level.</td>
+        </tr>
+
       </tbody>
     </table>
 
diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html
index 3c7604da8..b096f061f 100644
--- a/scintilla/doc/ScintillaDownload.html
+++ b/scintilla/doc/ScintillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/scintilla524.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla530.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla524.tgz">
+	<a href="https://www.scintilla.org/scintilla530.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.2.4
+       Release 5.3.0
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@
        The source code package contains all of the source code for Scintilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/scintilla524.zip">zip format</a> (1.3M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla524.tgz">tgz format</a> (1.2M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla530.zip">zip format</a> (1.3M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla530.tgz">tgz format</a> (1.2M) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html
index 5a11b5e68..27a8cd494 100644
--- a/scintilla/doc/ScintillaHistory.html
+++ b/scintilla/doc/ScintillaHistory.html
@@ -570,9 +570,64 @@
 	<td>Arkadiusz Michalski</td>
 	<td>Christian Schmitz</td>
 	<td>Michael Berlenz</td>
+	<td>Jacky Yang</td>
     </tr>
     </table>
     <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla530.zip">Release 5.3.0</a>
+    </h3>
+    <ul>
+	<li>
+	Released 27 August 2022.
+	</li>
+	<li>
+	Added change history which can display document changes (modified, saved, ...)
+	in the margin or in the text.
+	</li>
+	<li>
+	Add SC_MARK_BAR marker and INDIC_POINT_TOP indicator.
+	SC_MARK_BAR is an outlined and filled rectangle that takes the full height of the line and 1/3
+	of the margin width.
+	To give a connected appearance, it displays even on wrapped lines and draws end caps on the first and last line.
+	INDIC_POINT_TOP is the same as INDIC_POINT but draws at the top of the line instead of the bottom.
+	INDIC_POINT and INDIC_POINTCHARACTER were tweaked to be 1 pixel taller and 2 pixels wider in
+	two-phase draw mode to be clearer.
+	The translucency of INDIC_COMPOSITIONTHICK can be changed with SCI_INDICSETOUTLINEALPHA.
+	</li>
+	<li>
+	Improve drawing of rounded rectangles on Direct2D.
+	</li>
+	<li>
+	Line state optimized to avoid excess allocations by always allocating for every line.
+	This makes SCI_GETMAXLINESTATE less useful although it can still distinguish cases
+	where line state was never set for any lines.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1441/">Feature #1441</a>.
+	</li>
+	<li>
+	Add SC_FOLDACTION_CONTRACT_EVERY_LEVEL option to contract every level for
+	SCI_FOLDALL.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2340/">Bug #2340</a>.
+	</li>
+	<li>
+	Enable multiline regex for gcc and clang when REGEX_MULTILINE defined.
+	This requires gcc 11.3 or clang 14.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2338/">Bug #2338</a>.
+	</li>
+	<li>
+	Stop including STYLE_CALLTIP when calculating line height.
+	Allows a large font to be used for calltips without affecting text display.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2341/">Bug #2341</a>.
+	</li>
+	<li>
+	Fix incorrect display of selection when printing in some modes.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2335/">Bug #2335</a>.
+	</li>
+	<li>
+	Fix crash on Qt when showing autocompletion and the caret isn't on a screen.
+	Move autocompletion onto screen when above it.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla524.zip">Release 5.2.4</a>
     </h3>
diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html
index 7b1fdd184..f22a81a6d 100644
--- a/scintilla/doc/index.html
+++ b/scintilla/doc/index.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20220710" />
+    <meta name="Date.Modified" content="20220827" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         #versionlist {
@@ -56,8 +56,8 @@
           GTK, and macOS</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 5.2.4<br />
-           Site last modified July 10 2022</font>
+          <font color="#FFCC99" size="3"> Release version 5.3.0<br />
+           Site last modified August 27 2022</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,6 +72,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.3.0 adds change history.</li>
       <li>Version 5.2.4 fixes failures on GTK with multi-threaded layout.</li>
       <li>Version 5.2.3 adds 64-bit safe APIs and fixes scrollbar on GTK with Xorg.</li>
       <li>Version 5.2.2 on GTK, scroll horizontally with Shift + Scroll Wheel.</li>
diff --git a/scintilla/gtk/deps.mak b/scintilla/gtk/deps.mak
index 4b5e8f6e1..61649de33 100644
--- a/scintilla/gtk/deps.mak
+++ b/scintilla/gtk/deps.mak
@@ -138,8 +138,21 @@ CellBuffer.o: \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/SparseVector.h \
+	../src/ChangeHistory.h \
 	../src/CellBuffer.h \
 	../src/UniConversion.h
+ChangeHistory.o: \
+	../src/ChangeHistory.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/SparseVector.h \
+	../src/ChangeHistory.h
 CharacterCategoryMap.o: \
 	../src/CharacterCategoryMap.cxx \
 	../src/CharacterCategoryMap.h
diff --git a/scintilla/gtk/makefile b/scintilla/gtk/makefile
index 63f31bb23..c68b1879d 100644
--- a/scintilla/gtk/makefile
+++ b/scintilla/gtk/makefile
@@ -128,6 +128,7 @@ SRC_OBJS = \
 	CaseConvert.o \
 	CaseFolder.o \
 	CellBuffer.o \
+	ChangeHistory.o \
 	CharacterCategoryMap.o \
 	CharacterType.o \
 	CharClassify.o \
diff --git a/scintilla/include/Scintilla.h b/scintilla/include/Scintilla.h
index 96776226a..0c559397f 100644
--- a/scintilla/include/Scintilla.h
+++ b/scintilla/include/Scintilla.h
@@ -152,7 +152,12 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SC_MARK_RGBAIMAGE 30
 #define SC_MARK_BOOKMARK 31
 #define SC_MARK_VERTICALBOOKMARK 32
+#define SC_MARK_BAR 33
 #define SC_MARK_CHARACTER 10000
+#define SC_MARKNUM_HISTORY_REVERTED_TO_ORIGIN 21
+#define SC_MARKNUM_HISTORY_SAVED 22
+#define SC_MARKNUM_HISTORY_MODIFIED 23
+#define SC_MARKNUM_HISTORY_REVERTED_TO_MODIFIED 24
 #define SC_MARKNUM_FOLDEREND 25
 #define SC_MARKNUM_FOLDEROPENMID 26
 #define SC_MARKNUM_FOLDERMIDTAIL 27
@@ -353,7 +358,8 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define INDIC_POINTCHARACTER 19
 #define INDIC_GRADIENT 20
 #define INDIC_GRADIENTCENTRE 21
-#define INDIC_EXPLORERLINK 22
+#define INDIC_POINT_TOP 22
+#define INDIC_EXPLORERLINK 23
 #define INDIC_CONTAINER 8
 #define INDIC_IME 32
 #define INDIC_IME_MAX 35
@@ -361,7 +367,15 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define INDICATOR_CONTAINER 8
 #define INDICATOR_IME 32
 #define INDICATOR_IME_MAX 35
-#define INDICATOR_MAX 35
+#define INDICATOR_HISTORY_REVERTED_TO_ORIGIN_INSERTION 36
+#define INDICATOR_HISTORY_REVERTED_TO_ORIGIN_DELETION 37
+#define INDICATOR_HISTORY_SAVED_INSERTION 38
+#define INDICATOR_HISTORY_SAVED_DELETION 39
+#define INDICATOR_HISTORY_MODIFIED_INSERTION 40
+#define INDICATOR_HISTORY_MODIFIED_DELETION 41
+#define INDICATOR_HISTORY_REVERTED_TO_MODIFIED_INSERTION 42
+#define INDICATOR_HISTORY_REVERTED_TO_MODIFIED_DELETION 43
+#define INDICATOR_MAX 43
 #define SCI_INDICSETSTYLE 2080
 #define SCI_INDICGETSTYLE 2081
 #define SCI_INDICSETFORE 2082
@@ -478,6 +492,12 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SCI_FINDTEXTFULL 2196
 #define SCI_FORMATRANGE 2151
 #define SCI_FORMATRANGEFULL 2777
+#define SC_CHANGE_HISTORY_DISABLED 0
+#define SC_CHANGE_HISTORY_ENABLED 1
+#define SC_CHANGE_HISTORY_MARKERS 2
+#define SC_CHANGE_HISTORY_INDICATORS 4
+#define SCI_SETCHANGEHISTORY 2780
+#define SCI_GETCHANGEHISTORY 2781
 #define SCI_GETFIRSTVISIBLELINE 2152
 #define SCI_GETLINE 2153
 #define SCI_GETLINECOUNT 2154
@@ -492,6 +512,7 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SCI_GETTEXTRANGE 2162
 #define SCI_GETTEXTRANGEFULL 2039
 #define SCI_HIDESELECTION 2163
+#define SCI_GETSELECTIONHIDDEN 2088
 #define SCI_POINTXFROMPOSITION 2164
 #define SCI_POINTYFROMPOSITION 2165
 #define SCI_LINEFROMPOSITION 2166
@@ -578,6 +599,7 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
 #define SC_FOLDACTION_CONTRACT 0
 #define SC_FOLDACTION_EXPAND 1
 #define SC_FOLDACTION_TOGGLE 2
+#define SC_FOLDACTION_CONTRACT_EVERY_LEVEL 4
 #define SCI_FOLDLINE 2237
 #define SCI_FOLDCHILDREN 2238
 #define SCI_EXPANDCHILDREN 2239
diff --git a/scintilla/include/Scintilla.iface b/scintilla/include/Scintilla.iface
index 9209b44b6..511827744 100644
--- a/scintilla/include/Scintilla.iface
+++ b/scintilla/include/Scintilla.iface
@@ -358,6 +358,7 @@ val SC_MARK_UNDERLINE=29
 val SC_MARK_RGBAIMAGE=30
 val SC_MARK_BOOKMARK=31
 val SC_MARK_VERTICALBOOKMARK=32
+val SC_MARK_BAR=33
 
 val SC_MARK_CHARACTER=10000
 
@@ -385,7 +386,11 @@ ali SC_MARK_RGBAIMAGE=RGBA_IMAGE
 ali SC_MARK_VERTICALBOOKMARK=VERTICAL_BOOKMARK
 
 enu MarkerOutline=SC_MARKNUM_
-# Markers used for outlining column.
+# Markers used for outlining and change history columns.
+val SC_MARKNUM_HISTORY_REVERTED_TO_ORIGIN=21
+val SC_MARKNUM_HISTORY_SAVED=22
+val SC_MARKNUM_HISTORY_MODIFIED=23
+val SC_MARKNUM_HISTORY_REVERTED_TO_MODIFIED=24
 val SC_MARKNUM_FOLDEREND=25
 val SC_MARKNUM_FOLDEROPENMID=26
 val SC_MARKNUM_FOLDERMIDTAIL=27
@@ -842,6 +847,7 @@ val INDIC_POINT=18
 val INDIC_POINTCHARACTER=19
 val INDIC_GRADIENT=20
 val INDIC_GRADIENTCENTRE=21
+val INDIC_POINT_TOP=22
 
 # INDIC_CONTAINER, INDIC_IME, INDIC_IME_MAX, and INDIC_MAX are indicator numbers,
 # not IndicatorStyles so should not really be in the INDIC_ enumeration.
@@ -855,7 +861,15 @@ enu IndicatorNumbers=INDICATOR_
 val INDICATOR_CONTAINER=8
 val INDICATOR_IME=32
 val INDICATOR_IME_MAX=35
-val INDICATOR_MAX=35
+val INDICATOR_HISTORY_REVERTED_TO_ORIGIN_INSERTION=36
+val INDICATOR_HISTORY_REVERTED_TO_ORIGIN_DELETION=37
+val INDICATOR_HISTORY_SAVED_INSERTION=38
+val INDICATOR_HISTORY_SAVED_DELETION=39
+val INDICATOR_HISTORY_MODIFIED_INSERTION=40
+val INDICATOR_HISTORY_MODIFIED_DELETION=41
+val INDICATOR_HISTORY_REVERTED_TO_MODIFIED_INSERTION=42
+val INDICATOR_HISTORY_REVERTED_TO_MODIFIED_DELETION=43
+val INDICATOR_MAX=43
 
 ali INDIC_TT=T_T
 ali INDIC_ROUNDBOX=ROUND_BOX
@@ -1224,6 +1238,18 @@ fun position FormatRange=2151(bool draw, formatrange fr)
 # Draw the document into a display context such as a printer.
 fun position FormatRangeFull=2777(bool draw, formatrangefull fr)
 
+enu ChangeHistoryOption=SC_CHANGE_HISTORY_
+val SC_CHANGE_HISTORY_DISABLED=0
+val SC_CHANGE_HISTORY_ENABLED=1
+val SC_CHANGE_HISTORY_MARKERS=2
+val SC_CHANGE_HISTORY_INDICATORS=4
+
+# Enable or disable change history.
+set void SetChangeHistory=2780(ChangeHistoryOption changeHistory,)
+
+# Report change history status.
+get ChangeHistoryOption GetChangeHistory=2781(,)
+
 # Retrieve the display line at the top of the display.
 get line GetFirstVisibleLine=2152(,)
 
@@ -1271,6 +1297,9 @@ fun position GetTextRangeFull=2039(, textrangefull tr)
 # Draw the selection either highlighted or in normal (non-highlighted) style.
 fun void HideSelection=2163(bool hide,)
 
+#Is the selection visible or hidden?
+get bool GetSelectionHidden=2088(,)
+
 # Retrieve the x value of the point in the window where a position is displayed.
 fun int PointXFromPosition=2164(, position pos)
 
@@ -1534,6 +1563,7 @@ enu FoldAction=SC_FOLDACTION_
 val SC_FOLDACTION_CONTRACT=0
 val SC_FOLDACTION_EXPAND=1
 val SC_FOLDACTION_TOGGLE=2
+val SC_FOLDACTION_CONTRACT_EVERY_LEVEL=4
 
 # Expand or contract a fold header.
 fun void FoldLine=2237(line line, FoldAction action)
diff --git a/scintilla/include/ScintillaCall.h b/scintilla/include/ScintillaCall.h
index 40cf1e576..0e79e37db 100644
--- a/scintilla/include/ScintillaCall.h
+++ b/scintilla/include/ScintillaCall.h
@@ -326,6 +326,8 @@ public:
 	Position FindTextFull(Scintilla::FindOption searchFlags, void *ft);
 	Position FormatRange(bool draw, void *fr);
 	Position FormatRangeFull(bool draw, void *fr);
+	void SetChangeHistory(Scintilla::ChangeHistoryOption changeHistory);
+	Scintilla::ChangeHistoryOption ChangeHistory();
 	Line FirstVisibleLine();
 	Position GetLine(Line line, char *text);
 	std::string GetLine(Line line);
@@ -342,6 +344,7 @@ public:
 	Position GetTextRange(void *tr);
 	Position GetTextRangeFull(void *tr);
 	void HideSelection(bool hide);
+	bool SelectionHidden();
 	int PointXFromPosition(Position pos);
 	int PointYFromPosition(Position pos);
 	Line LineFromPosition(Position pos);
diff --git a/scintilla/include/ScintillaMessages.h b/scintilla/include/ScintillaMessages.h
index 3a2b63aad..99b8fd5e1 100644
--- a/scintilla/include/ScintillaMessages.h
+++ b/scintilla/include/ScintillaMessages.h
@@ -261,6 +261,8 @@ enum class Message {
 	FindTextFull = 2196,
 	FormatRange = 2151,
 	FormatRangeFull = 2777,
+	SetChangeHistory = 2780,
+	GetChangeHistory = 2781,
 	GetFirstVisibleLine = 2152,
 	GetLine = 2153,
 	GetLineCount = 2154,
@@ -275,6 +277,7 @@ enum class Message {
 	GetTextRange = 2162,
 	GetTextRangeFull = 2039,
 	HideSelection = 2163,
+	GetSelectionHidden = 2088,
 	PointXFromPosition = 2164,
 	PointYFromPosition = 2165,
 	LineFromPosition = 2166,
diff --git a/scintilla/include/ScintillaStructures.h b/scintilla/include/ScintillaStructures.h
index 462d50de0..4586f86b5 100644
--- a/scintilla/include/ScintillaStructures.h
+++ b/scintilla/include/ScintillaStructures.h
@@ -82,6 +82,8 @@ struct NotifyHeader {
 	Notification code;
 };
 
+enum class Message;	// Declare in case ScintillaMessages.h not included
+
 struct NotificationData {
 	NotifyHeader nmhdr;
 	Position position;
diff --git a/scintilla/include/ScintillaTypes.h b/scintilla/include/ScintillaTypes.h
index b6cd8347d..8e32b4ce5 100644
--- a/scintilla/include/ScintillaTypes.h
+++ b/scintilla/include/ScintillaTypes.h
@@ -86,10 +86,15 @@ enum class MarkerSymbol {
 	RgbaImage = 30,
 	Bookmark = 31,
 	VerticalBookmark = 32,
+	Bar = 33,
 	Character = 10000,
 };
 
 enum class MarkerOutline {
+	HistoryRevertedToOrigin = 21,
+	HistorySaved = 22,
+	HistoryModified = 23,
+	HistoryRevertedToModified = 24,
 	FolderEnd = 25,
 	FolderOpenMid = 26,
 	FolderMidTail = 27,
@@ -213,14 +218,23 @@ enum class IndicatorStyle {
 	PointCharacter = 19,
 	Gradient = 20,
 	GradientCentre = 21,
-	ExplorerLink = 22,
+	PointTop = 22,
+	ExplorerLink = 23,
 };
 
 enum class IndicatorNumbers {
 	Container = 8,
 	Ime = 32,
 	ImeMax = 35,
-	Max = 35,
+	HistoryRevertedToOriginInsertion = 36,
+	HistoryRevertedToOriginDeletion = 37,
+	HistorySavedInsertion = 38,
+	HistorySavedDeletion = 39,
+	HistoryModifiedInsertion = 40,
+	HistoryModifiedDeletion = 41,
+	HistoryRevertedToModifiedInsertion = 42,
+	HistoryRevertedToModifiedDeletion = 43,
+	Max = 43,
 };
 
 enum class IndicValue {
@@ -264,6 +278,13 @@ enum class FindOption {
 	Cxx11RegEx = 0x00800000,
 };
 
+enum class ChangeHistoryOption {
+	Disabled = 0,
+	Enabled = 1,
+	Markers = 2,
+	Indicators = 4,
+};
+
 enum class FoldLevel {
 	None = 0x0,
 	Base = 0x400,
@@ -282,6 +303,7 @@ enum class FoldAction {
 	Contract = 0,
 	Expand = 1,
 	Toggle = 2,
+	ContractEveryLevel = 4,
 };
 
 enum class AutomaticFold {
@@ -797,6 +819,15 @@ constexpr KeyMod operator&(KeyMod a, KeyMod b) noexcept {
 	return static_cast<KeyMod>(static_cast<int>(a) & static_cast<int>(b));
 }
 
+constexpr KeyMod ModifierFlags(bool shift, bool ctrl, bool alt, bool meta=false, bool super=false) noexcept {
+	return
+		(shift ? KeyMod::Shift : KeyMod::Norm) |
+		(ctrl ? KeyMod::Ctrl : KeyMod::Norm) |
+		(alt ? KeyMod::Alt : KeyMod::Norm) |
+		(meta ? KeyMod::Meta : KeyMod::Norm) |
+		(super ? KeyMod::Super : KeyMod::Norm);
+}
+
 // Test if an enum class value has some bit flag(s) of test set.
 template <typename T>
 constexpr bool FlagSet(T value, T test) {
diff --git a/scintilla/qt/ScintillaEdit/ScintillaEdit.pro b/scintilla/qt/ScintillaEdit/ScintillaEdit.pro
index e8e837ccb..27cd1f359 100644
--- a/scintilla/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/scintilla/qt/ScintillaEdit/ScintillaEdit.pro
@@ -13,7 +13,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 5.2.4
+VERSION = 5.3.0
 
 SOURCES += \
     ScintillaEdit.cpp \
@@ -47,6 +47,7 @@ SOURCES += \
     ../../src/CharClassify.cxx \
     ../../src/CharacterType.cxx \
     ../../src/CharacterCategoryMap.cxx \
+    ../../src/ChangeHistory.cxx \
     ../../src/CellBuffer.cxx \
     ../../src/CaseFolder.cxx \
     ../../src/CaseConvert.cxx \
diff --git a/scintilla/qt/ScintillaEditBase/PlatQt.cpp b/scintilla/qt/ScintillaEditBase/PlatQt.cpp
index d01ed0b43..a60b790a8 100644
--- a/scintilla/qt/ScintillaEditBase/PlatQt.cpp
+++ b/scintilla/qt/ScintillaEditBase/PlatQt.cpp
@@ -790,6 +790,9 @@ QRect ScreenRectangleForPoint(QPoint posGlobal)
 {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 	const QScreen *screen = QGuiApplication::screenAt(posGlobal);
+	if (!screen) {
+		screen = QGuiApplication::primaryScreen();
+	}
 	return screen->availableGeometry();
 #else
 	const QDesktopWidget *desktop = QApplication::desktop();
@@ -840,6 +843,8 @@ void Window::SetPositionRelative(PRectangle rc, const Window *relativeTo)
 		ox = rectDesk.right() - sizex;
 	if (oy + sizey > rectDesk.bottom())
 		oy = rectDesk.bottom() - sizey;
+	if (oy < rectDesk.top())
+		oy = rectDesk.top();
 
 	Q_ASSERT(wid);
 	window(wid)->move(ox, oy);
diff --git a/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp b/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp
index 151b4b67d..410c0ee42 100644
--- a/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/scintilla/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -257,7 +257,7 @@ void ScintillaEditBase::keyPressEvent(QKeyEvent *event)
 
 	bool consumed = false;
 	bool added = sqt->KeyDownWithModifiers(static_cast<Keys>(key),
-					       ScintillaQt::ModifierFlags(shift, ctrl, alt),
+					       ModifierFlags(shift, ctrl, alt),
 					       &consumed) != 0;
 	if (!consumed)
 		consumed = added;
@@ -331,7 +331,7 @@ void ScintillaEditBase::mousePressEvent(QMouseEvent *event)
 		bool alt   = QApplication::keyboardModifiers() & Qt::AltModifier;
 #endif
 
-		sqt->ButtonDownWithModifiers(pos, time.elapsed(), ScintillaQt::ModifierFlags(shift, ctrl, alt));
+		sqt->ButtonDownWithModifiers(pos, time.elapsed(), ModifierFlags(shift, ctrl, alt));
 	}
 
 	if (event->button() == Qt::RightButton) {
@@ -373,7 +373,7 @@ void ScintillaEditBase::mouseMoveEvent(QMouseEvent *event)
 	bool alt   = QApplication::keyboardModifiers() & Qt::AltModifier;
 #endif
 
-	const KeyMod modifiers = ScintillaQt::ModifierFlags(shift, ctrl, alt);
+	const KeyMod modifiers = ModifierFlags(shift, ctrl, alt);
 
 	sqt->ButtonMoveWithModifiers(pos, time.elapsed(), modifiers);
 }
@@ -826,5 +826,5 @@ KeyMod ScintillaEditBase::ModifiersOfKeyboard()
 	const bool ctrl  = QApplication::keyboardModifiers() & Qt::ControlModifier;
 	const bool alt   = QApplication::keyboardModifiers() & Qt::AltModifier;
 
-	return ScintillaQt::ModifierFlags(shift, ctrl, alt);
+	return ModifierFlags(shift, ctrl, alt);
 }
diff --git a/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro b/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro
index 1db838353..400e82bbc 100644
--- a/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 5.2.4
+VERSION = 5.3.0
 
 SOURCES += \
     PlatQt.cpp \
@@ -44,6 +44,7 @@ SOURCES += \
     ../../src/CharClassify.cxx \
     ../../src/CharacterType.cxx \
     ../../src/CharacterCategoryMap.cxx \
+    ../../src/ChangeHistory.cxx \
     ../../src/CellBuffer.cxx \
     ../../src/CaseFolder.cxx \
     ../../src/CaseConvert.cxx \
@@ -78,6 +79,7 @@ HEADERS  += \
     ../../src/CharClassify.h \
     ../../src/CharacterType.h \
     ../../src/CharacterCategoryMap.h \
+    ../../src/ChangeHistory.h \
     ../../src/CellBuffer.h \
     ../../src/CaseFolder.h \
     ../../src/CaseConvert.h \
diff --git a/scintilla/scripts/CheckMentioned.py b/scintilla/scripts/CheckMentioned.py
index 157acb31e..3e87be79c 100644
--- a/scintilla/scripts/CheckMentioned.py
+++ b/scintilla/scripts/CheckMentioned.py
@@ -61,6 +61,12 @@ def convertIFaceTypeToC(t):
 		return "Sci_TextToFind *"
 	elif t == "formatrange":
 		return "Sci_RangeToFormat *"
+	elif t == "textrangefull":
+		return "Sci_TextRangeFull *"
+	elif t == "findtextfull":
+		return "Sci_TextToFindFull *"
+	elif t == "formatrangefull":
+		return "Sci_RangeToFormatFull *"
 	elif Face.IsEnumeration(t):
 		return "int "
 	return t + " "
diff --git a/scintilla/scripts/HeaderOrder.txt b/scintilla/scripts/HeaderOrder.txt
index 9001736ed..b47057e7b 100644
--- a/scintilla/scripts/HeaderOrder.txt
+++ b/scintilla/scripts/HeaderOrder.txt
@@ -119,6 +119,7 @@
 #include "RunStyles.h"
 #include "SparseVector.h"
 #include "ContractionState.h"
+#include "ChangeHistory.h"
 #include "CellBuffer.h"
 #include "PerLine.h"
 #include "CallTip.h"
diff --git a/scintilla/src/CellBuffer.cxx b/scintilla/src/CellBuffer.cxx
index 87d65e4c1..3bf6260dd 100644
--- a/scintilla/src/CellBuffer.cxx
+++ b/scintilla/src/CellBuffer.cxx
@@ -27,6 +27,9 @@
 #include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
+#include "RunStyles.h"
+#include "SparseVector.h"
+#include "ChangeHistory.h"
 #include "CellBuffer.h"
 #include "UniConversion.h"
 
@@ -91,6 +94,11 @@ using namespace Scintilla::Internal;
 
 template <typename POS>
 class LineStartIndex {
+	// line_cast(): cast Sci::Line to either 32-bit or 64-bit value
+	// This avoids warnings from Visual C++ Code Analysis and shortens code
+	static constexpr POS line_cast(Sci::Line pos) noexcept {
+		return static_cast<POS>(pos);
+	}
 public:
 	int refCount;
 	Partitioning<POS> starts;
@@ -98,20 +106,13 @@ public:
 	LineStartIndex() : refCount(0), starts(4) {
 		// Minimal initial allocation
 	}
-	// Deleted so LineStartIndex objects can not be copied.
-	LineStartIndex(const LineStartIndex &) = delete;
-	LineStartIndex(LineStartIndex &&) = delete;
-	void operator=(const LineStartIndex &) = delete;
-	void operator=(LineStartIndex &&) = delete;
-	virtual ~LineStartIndex() {
-	}
 	bool Allocate(Sci::Line lines) {
 		refCount++;
 		Sci::Position length = starts.PositionFromPartition(starts.Partitions());
 		for (Sci::Line line = starts.Partitions(); line < lines; line++) {
 			// Produce an ascending sequence that will be filled in with correct widths later
 			length++;
-			starts.InsertPartition(static_cast<POS>(line), static_cast<POS>(length));
+			starts.InsertPartition(line_cast(line), line_cast(length));
 		}
 		return refCount == 1;
 	}
@@ -126,12 +127,12 @@ public:
 		return refCount > 0;
 	}
 	Sci::Position LineWidth(Sci::Line line) const noexcept {
-		return starts.PositionFromPartition(static_cast<POS>(line) + 1) -
-			starts.PositionFromPartition(static_cast<POS>(line));
+		return starts.PositionFromPartition(line_cast(line) + 1) -
+			starts.PositionFromPartition(line_cast(line));
 	}
 	void SetLineWidth(Sci::Line line, Sci::Position width) noexcept {
 		const Sci::Position widthCurrent = LineWidth(line);
-		starts.InsertText(static_cast<POS>(line), static_cast<POS>(width - widthCurrent));
+		starts.InsertText(line_cast(line), line_cast(width - widthCurrent));
 	}
 	void AllocateLines(Sci::Line lines) {
 		if (lines > starts.Partitions()) {
@@ -141,9 +142,9 @@ public:
 	void InsertLines(Sci::Line line, Sci::Line lines) {
 		// Insert multiple lines with each temporarily 1 character wide.
 		// The line widths will be fixed up by later measuring code.
-		const POS lineAsPos = static_cast<POS>(line);
+		const POS lineAsPos = line_cast(line);
 		const POS lineStart = starts.PositionFromPartition(lineAsPos - 1) + 1;
-		for (POS l = 0; l < static_cast<POS>(lines); l++) {
+		for (POS l = 0; l < line_cast(lines); l++) {
 			starts.InsertPartition(lineAsPos + l, lineStart + l);
 		}
 	}
@@ -163,16 +164,21 @@ class LineVector : public ILineVector {
 			| (startsUTF16.Active() ? LineCharacterIndexType::Utf16 : LineCharacterIndexType::None);
 	}
 
+	// pos_cast(): cast Sci::Line and Sci::Position to either 32-bit or 64-bit value
+	// This avoids warnings from Visual C++ Code Analysis and shortens code
+	static constexpr POS pos_cast(Sci::Position pos) noexcept {
+		return static_cast<POS>(pos);
+	}
+
+	// line_from_pos_cast(): return 32-bit or 64-bit value as Sci::Line 
+	// This avoids warnings from Visual C++ Code Analysis and shortens code
+	static constexpr Sci::Line line_from_pos_cast(POS line) noexcept {
+		return static_cast<Sci::Line>(line);
+	}
+
 public:
 	LineVector() : starts(256), perLine(nullptr), activeIndices(LineCharacterIndexType::None) {
 	}
-	// Deleted so LineVector objects can not be copied.
-	LineVector(const LineVector &) = delete;
-	LineVector(LineVector &&) = delete;
-	LineVector &operator=(const LineVector &) = delete;
-	LineVector &operator=(LineVector &&) = delete;
-	~LineVector() override {
-	}
 	void Init() override {
 		starts.DeleteAll();
 		if (perLine) {
@@ -185,11 +191,11 @@ public:
 		perLine = pl;
 	}
 	void InsertText(Sci::Line line, Sci::Position delta) noexcept override {
-		starts.InsertText(static_cast<POS>(line), static_cast<POS>(delta));
+		starts.InsertText(pos_cast(line), pos_cast(delta));
 	}
 	void InsertLine(Sci::Line line, Sci::Position position, bool lineStart) override {
-		const POS lineAsPos = static_cast<POS>(line);
-		starts.InsertPartition(lineAsPos, static_cast<POS>(position));
+		const POS lineAsPos = pos_cast(line);
+		starts.InsertPartition(lineAsPos, pos_cast(position));
 		if (activeIndices != LineCharacterIndexType::None) {
 			if (FlagSet(activeIndices, LineCharacterIndexType::Utf32)) {
 				startsUTF32.InsertLines(line, 1);
@@ -205,7 +211,7 @@ public:
 		}
 	}
 	void InsertLines(Sci::Line line, const Sci::Position *positions, size_t lines, bool lineStart) override {
-		const POS lineAsPos = static_cast<POS>(line);
+		const POS lineAsPos = pos_cast(line);
 		if constexpr (sizeof(Sci::Position) == sizeof(POS)) {
 			starts.InsertPartitions(lineAsPos, positions, lines);
 		} else {
@@ -226,22 +232,22 @@ public:
 		}
 	}
 	void SetLineStart(Sci::Line line, Sci::Position position) noexcept override {
-		starts.SetPartitionStartPosition(static_cast<POS>(line), static_cast<POS>(position));
+		starts.SetPartitionStartPosition(pos_cast(line), pos_cast(position));
 	}
 	void RemoveLine(Sci::Line line) override {
-		starts.RemovePartition(static_cast<POS>(line));
+		starts.RemovePartition(pos_cast(line));
 		if (FlagSet(activeIndices, LineCharacterIndexType::Utf32)) {
-			startsUTF32.starts.RemovePartition(static_cast<POS>(line));
+			startsUTF32.starts.RemovePartition(pos_cast(line));
 		}
 		if (FlagSet(activeIndices, LineCharacterIndexType::Utf16)) {
-			startsUTF16.starts.RemovePartition(static_cast<POS>(line));
+			startsUTF16.starts.RemovePartition(pos_cast(line));
 		}
 		if (perLine) {
 			perLine->RemoveLine(line);
 		}
 	}
 	Sci::Line Lines() const noexcept override {
-		return static_cast<Sci::Line>(starts.Partitions());
+		return line_from_pos_cast(starts.Partitions());
 	}
 	void AllocateLines(Sci::Line lines) override {
 		if (lines > Lines()) {
@@ -255,17 +261,17 @@ public:
 		}
 	}
 	Sci::Line LineFromPosition(Sci::Position pos) const noexcept override {
-		return static_cast<Sci::Line>(starts.PartitionFromPosition(static_cast<POS>(pos)));
+		return line_from_pos_cast(starts.PartitionFromPosition(pos_cast(pos)));
 	}
 	Sci::Position LineStart(Sci::Line line) const noexcept override {
-		return starts.PositionFromPartition(static_cast<POS>(line));
+		return starts.PositionFromPartition(pos_cast(line));
 	}
 	void InsertCharacters(Sci::Line line, CountWidths delta) noexcept override {
 		if (FlagSet(activeIndices, LineCharacterIndexType::Utf32)) {
-			startsUTF32.starts.InsertText(static_cast<POS>(line), static_cast<POS>(delta.WidthUTF32()));
+			startsUTF32.starts.InsertText(pos_cast(line), pos_cast(delta.WidthUTF32()));
 		}
 		if (FlagSet(activeIndices, LineCharacterIndexType::Utf16)) {
-			startsUTF16.starts.InsertText(static_cast<POS>(line), static_cast<POS>(delta.WidthUTF16()));
+			startsUTF16.starts.InsertText(pos_cast(line), pos_cast(delta.WidthUTF16()));
 		}
 	}
 	void SetLineCharactersWidth(Sci::Line line, CountWidths width) noexcept override {
@@ -308,16 +314,16 @@ public:
 	}
 	Sci::Position IndexLineStart(Sci::Line line, LineCharacterIndexType lineCharacterIndex) const noexcept override {
 		if (lineCharacterIndex == LineCharacterIndexType::Utf32) {
-			return startsUTF32.starts.PositionFromPartition(static_cast<POS>(line));
+			return startsUTF32.starts.PositionFromPartition(pos_cast(line));
 		} else {
-			return startsUTF16.starts.PositionFromPartition(static_cast<POS>(line));
+			return startsUTF16.starts.PositionFromPartition(pos_cast(line));
 		}
 	}
 	Sci::Line LineFromPositionIndex(Sci::Position pos, LineCharacterIndexType lineCharacterIndex) const noexcept override {
 		if (lineCharacterIndex == LineCharacterIndexType::Utf32) {
-			return static_cast<Sci::Line>(startsUTF32.starts.PartitionFromPosition(static_cast<POS>(pos)));
+			return line_from_pos_cast(startsUTF32.starts.PartitionFromPosition(pos_cast(pos)));
 		} else {
-			return static_cast<Sci::Line>(startsUTF16.starts.PartitionFromPosition(static_cast<POS>(pos)));
+			return line_from_pos_cast(startsUTF16.starts.PartitionFromPosition(pos_cast(pos)));
 		}
 	}
 };
@@ -329,9 +335,6 @@ Action::Action() noexcept {
 	mayCoalesce = false;
 }
 
-Action::~Action() {
-}
-
 void Action::Create(ActionType at_, Sci::Position position_, const char *data_, Sci::Position lenData_, bool mayCoalesce_) {
 	data = nullptr;
 	position = position_;
@@ -379,9 +382,6 @@ UndoHistory::UndoHistory() {
 	actions[currentAction].Create(ActionType::start);
 }
 
-UndoHistory::~UndoHistory() {
-}
-
 void UndoHistory::EnsureUndoRoom() {
 	// Have to test that there is room for 2 more actions in the array
 	// as two actions may be created by the calling function
@@ -399,12 +399,17 @@ const char *UndoHistory::AppendAction(ActionType at, Sci::Position position, con
 	//	actions[currentAction - 1].position, actions[currentAction - 1].lenData);
 	if (currentAction < savePoint) {
 		savePoint = -1;
+		if (!detach) {
+			detach = currentAction;
+		}
+	} else if (detach && (*detach > currentAction)) {
+		detach = currentAction;
 	}
 	int oldCurrentAction = currentAction;
 	if (currentAction >= 1) {
 		if (0 == undoSequenceDepth) {
 			// Top level actions may not always be coalesced
-			int targetAct = -1;
+			ptrdiff_t targetAct = -1;
 			const Action *actPrevious = &(actions[currentAction + targetAct]);
 			// Container actions may forward the coalesce state of Scintilla Actions.
 			while ((actPrevious->at == ActionType::container) && actPrevious->mayCoalesce) {
@@ -506,12 +511,29 @@ void UndoHistory::DeleteUndoHistory() {
 
 void UndoHistory::SetSavePoint() noexcept {
 	savePoint = currentAction;
+	detach.reset();
 }
 
 bool UndoHistory::IsSavePoint() const noexcept {
 	return savePoint == currentAction;
 }
 
+bool UndoHistory::BeforeSavePoint() const noexcept {
+	return (savePoint < 0) || (savePoint > currentAction);
+}
+
+bool UndoHistory::BeforeReachableSavePoint() const noexcept {
+	return (savePoint >= 0) && !detach && (savePoint > currentAction);
+}
+
+bool UndoHistory::AfterSavePoint() const noexcept {
+	return (savePoint >= 0) && (savePoint <= currentAction);
+}
+
+bool UndoHistory::AfterDetachPoint() const noexcept {
+	return detach && (*detach < currentAction);
+}
+
 void UndoHistory::TentativeStart() {
 	tentativePoint = currentAction;
 }
@@ -598,8 +620,7 @@ CellBuffer::CellBuffer(bool hasStyles_, bool largeDocument_) :
 		plv = std::make_unique<LineVector<int>>();
 }
 
-CellBuffer::~CellBuffer() {
-}
+CellBuffer::~CellBuffer() noexcept = default;
 
 char CellBuffer::CharAt(Sci::Position position) const noexcept {
 	return substance.ValueAt(position);
@@ -686,6 +707,9 @@ const char *CellBuffer::InsertString(Sci::Position position, const char *s, Sci:
 		}
 
 		BasicInsertString(position, s, insertLength);
+		if (changeHistory) {
+			changeHistory->Insert(position, insertLength, collectingUndo, uh.BeforeReachableSavePoint());
+		}
 	}
 	return data;
 }
@@ -734,6 +758,11 @@ const char *CellBuffer::DeleteChars(Sci::Position position, Sci::Position delete
 			data = uh.AppendAction(ActionType::remove, position, data, deleteLength, startSequence);
 		}
 
+		if (changeHistory) {
+			changeHistory->DeleteRangeSavingHistory(position, deleteLength,
+				uh.BeforeReachableSavePoint(), uh.AfterDetachPoint());
+		}
+
 		BasicDeleteChars(position, deleteLength);
 	}
 	return data;
@@ -849,6 +878,9 @@ bool CellBuffer::HasStyles() const noexcept {
 
 void CellBuffer::SetSavePoint() {
 	uh.SetSavePoint();
+	if (changeHistory) {
+		changeHistory->SetSavePoint();
+	}
 }
 
 bool CellBuffer::IsSavePoint() const noexcept {
@@ -1308,14 +1340,24 @@ const Action &CellBuffer::GetUndoStep() const {
 
 void CellBuffer::PerformUndoStep() {
 	const Action &actionStep = uh.GetUndoStep();
+	if (changeHistory && uh.BeforeSavePoint()) {
+		changeHistory->StartReversion();
+	}
 	if (actionStep.at == ActionType::insert) {
 		if (substance.Length() < actionStep.lenData) {
 			throw std::runtime_error(
 				"CellBuffer::PerformUndoStep: deletion must be less than document length.");
 		}
+		if (changeHistory) {
+			changeHistory->DeleteRange(actionStep.position, actionStep.lenData,
+				uh.BeforeSavePoint() && !uh.AfterDetachPoint());
+		}
 		BasicDeleteChars(actionStep.position, actionStep.lenData);
 	} else if (actionStep.at == ActionType::remove) {
 		BasicInsertString(actionStep.position, actionStep.data.get(), actionStep.lenData);
+		if (changeHistory) {
+			changeHistory->UndoDeleteStep(actionStep.position, actionStep.lenData, uh.AfterDetachPoint());
+		}
 	}
 	uh.CompletedUndoStep();
 }
@@ -1336,9 +1378,57 @@ void CellBuffer::PerformRedoStep() {
 	const Action &actionStep = uh.GetRedoStep();
 	if (actionStep.at == ActionType::insert) {
 		BasicInsertString(actionStep.position, actionStep.data.get(), actionStep.lenData);
+		if (changeHistory) {
+			changeHistory->Insert(actionStep.position, actionStep.lenData, collectingUndo,
+				uh.BeforeSavePoint() && !uh.AfterDetachPoint());
+		}
 	} else if (actionStep.at == ActionType::remove) {
+		if (changeHistory) {
+			changeHistory->DeleteRangeSavingHistory(actionStep.position, actionStep.lenData,
+				uh.BeforeReachableSavePoint(), uh.AfterDetachPoint());
+		}
 		BasicDeleteChars(actionStep.position, actionStep.lenData);
 	}
+	if (changeHistory && uh.AfterSavePoint()) {
+		changeHistory->EndReversion();
+	}
 	uh.CompletedRedoStep();
 }
 
+void CellBuffer::ChangeHistorySet(bool set) {
+	if (set) {
+		if (!changeHistory) {
+			changeHistory = std::make_unique<ChangeHistory>(Length());
+		}
+	} else {
+		changeHistory.reset();
+	}
+}
+
+int CellBuffer::EditionAt(Sci::Position pos) const noexcept {
+	if (changeHistory) {
+		return changeHistory->EditionAt(pos);
+	}
+	return 0;
+}
+
+Sci::Position CellBuffer::EditionEndRun(Sci::Position pos) const noexcept {
+	if (changeHistory) {
+		return changeHistory->EditionEndRun(pos);
+	}
+	return Length();
+}
+
+unsigned int CellBuffer::EditionDeletesAt(Sci::Position pos) const noexcept {
+	if (changeHistory) {
+		return changeHistory->EditionDeletesAt(pos);
+	}
+	return 0;
+}
+
+Sci::Position CellBuffer::EditionNextDelete(Sci::Position pos) const noexcept {
+	if (changeHistory) {
+		return changeHistory->EditionNextDelete(pos);
+	}
+	return Length() + 1;
+}
diff --git a/scintilla/src/CellBuffer.h b/scintilla/src/CellBuffer.h
index 55c17b704..92323dafc 100644
--- a/scintilla/src/CellBuffer.h
+++ b/scintilla/src/CellBuffer.h
@@ -20,6 +20,7 @@ public:
 	virtual void RemoveLine(Sci::Line line)=0;
 };
 
+class ChangeHistory;
 /**
  * The line vector contains information about each of the lines in a cell buffer.
  */
@@ -39,13 +40,6 @@ public:
 	bool mayCoalesce;
 
 	Action() noexcept;
-	// Deleted so Action objects can not be copied.
-	Action(const Action &other) = delete;
-	Action &operator=(const Action &other) = delete;
-	Action &operator=(const Action &&other) = delete;
-	// Move constructor allows vector to be resized without reallocating.
-	Action(Action &&other) noexcept = default;
-	~Action();
 	void Create(ActionType at_, Sci::Position position_=0, const char *data_=nullptr, Sci::Position lenData_=0, bool mayCoalesce_=true);
 	void Clear() noexcept;
 };
@@ -60,17 +54,12 @@ class UndoHistory {
 	int undoSequenceDepth;
 	int savePoint;
 	int tentativePoint;
+	std::optional<int> detach;
 
 	void EnsureUndoRoom();
 
 public:
 	UndoHistory();
-	// Deleted so UndoHistory objects can not be copied.
-	UndoHistory(const UndoHistory &) = delete;
-	UndoHistory(UndoHistory &&) = delete;
-	void operator=(const UndoHistory &) = delete;
-	void operator=(UndoHistory &&) = delete;
-	~UndoHistory();
 
 	const char *AppendAction(ActionType at, Sci::Position position, const char *data, Sci::Position lengthData, bool &startSequence, bool mayCoalesce=true);
 
@@ -83,6 +72,10 @@ public:
 	/// the buffer was saved. Undo and redo can move over the save point.
 	void SetSavePoint() noexcept;
 	bool IsSavePoint() const noexcept;
+	bool BeforeSavePoint() const noexcept;
+	bool BeforeReachableSavePoint() const noexcept;
+	bool AfterSavePoint() const noexcept;
+	bool AfterDetachPoint() const noexcept;
 
 	// Tentative actions are used for input composition so that it can be undone cleanly
 	void TentativeStart();
@@ -146,6 +139,8 @@ private:
 	bool collectingUndo;
 	UndoHistory uh;
 
+	std::unique_ptr<ChangeHistory> changeHistory;
+
 	std::unique_ptr<ILineVector> plv;
 
 	bool UTF8LineEndOverlaps(Sci::Position position) const noexcept;
@@ -163,9 +158,9 @@ public:
 	// Deleted so CellBuffer objects can not be copied.
 	CellBuffer(const CellBuffer &) = delete;
 	CellBuffer(CellBuffer &&) = delete;
-	void operator=(const CellBuffer &) = delete;
-	void operator=(CellBuffer &&) = delete;
-	~CellBuffer();
+	CellBuffer &operator=(const CellBuffer &) = delete;
+	CellBuffer &operator=(CellBuffer &&) = delete;
+	~CellBuffer() noexcept;
 
 	/// Retrieving positions outside the range of the buffer works and returns 0
 	char CharAt(Sci::Position position) const noexcept;
@@ -237,6 +232,12 @@ public:
 	int StartRedo();
 	const Action &GetRedoStep() const;
 	void PerformRedoStep();
+
+	void ChangeHistorySet(bool set);
+	[[nodiscard]] int EditionAt(Sci::Position pos) const noexcept;
+	[[nodiscard]] Sci::Position EditionEndRun(Sci::Position pos) const noexcept;
+	[[nodiscard]] unsigned int EditionDeletesAt(Sci::Position pos) const noexcept;
+	[[nodiscard]] Sci::Position EditionNextDelete(Sci::Position pos) const noexcept;
 };
 
 }
diff --git a/scintilla/src/ChangeHistory.cxx b/scintilla/src/ChangeHistory.cxx
new file mode 100644
index 000000000..4c771a93c
--- /dev/null
+++ b/scintilla/src/ChangeHistory.cxx
@@ -0,0 +1,422 @@
+// Scintilla source code edit control
+/** @file ChangeHistory.cxx
+ ** Manages a history of changes in a document.
+ **/
+// Copyright 2022 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cassert>
+
+#include <stdexcept>
+#include <vector>
+#include <set>
+#include <algorithm>
+#include <memory>
+
+#include "ScintillaTypes.h"
+
+#include "Debugging.h"
+
+#include "Position.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+#include "SparseVector.h"
+#include "ChangeHistory.h"
+
+namespace Scintilla::Internal {
+
+void ChangeStack::Clear() noexcept {
+	steps.clear();
+	insertions.clear();
+}
+
+void ChangeStack::AddStep() {
+	steps.push_back(0);
+}
+
+void ChangeStack::PushDeletion(Sci::Position positionDeletion, int edition) {
+	steps.back()++;
+	insertions.push_back({ positionDeletion, 0, edition, InsertionSpan::Direction::deletion });
+}
+
+void ChangeStack::PushInsertion(Sci::Position positionInsertion, Sci::Position length, int edition) {
+	steps.back()++;
+	insertions.push_back({ positionInsertion, length, edition, InsertionSpan::Direction::insertion });
+};
+
+size_t ChangeStack::PopStep() noexcept {
+	const size_t spans = steps.back();
+	steps.pop_back();
+	return spans;
+}
+
+InsertionSpan ChangeStack::PopSpan() noexcept {
+	const InsertionSpan span = insertions.back();
+	insertions.pop_back();
+	return span;
+}
+
+void ChangeStack::SetSavePoint() noexcept {
+	// Switch changeUnsaved to changeSaved
+	for (InsertionSpan &x : insertions) {
+		if (x.edition == changeModified) {
+			x.edition = changeSaved;
+		}
+	}
+}
+
+void ChangeLog::Clear(Sci::Position length) {
+	changeStack.Clear();
+	insertEdition.DeleteAll();
+	deleteEdition.DeleteAll();
+	InsertSpace(0, length);
+}
+
+void ChangeLog::InsertSpace(Sci::Position position, Sci::Position insertLength) {
+	assert(insertEdition.Length() == deleteEdition.Length());
+	insertEdition.InsertSpace(position, insertLength);
+	deleteEdition.InsertSpace(position, insertLength);
+}
+
+void ChangeLog::DeleteRange(Sci::Position position, Sci::Position deleteLength) {
+	insertEdition.DeleteRange(position, deleteLength);
+	const EditionSetOwned &editions = deleteEdition.ValueAt(position);
+	if (editions) {
+		const EditionSet savedEditions = *editions;
+		deleteEdition.DeleteRange(position, deleteLength);
+		EditionSetOwned reset = std::make_unique<EditionSet>(savedEditions);
+		deleteEdition.SetValueAt(position, std::move(reset));
+	} else {
+		deleteEdition.DeleteRange(position, deleteLength);
+	}
+	assert(insertEdition.Length() == deleteEdition.Length());
+}
+
+void ChangeLog::Insert(Sci::Position start, Sci::Position length, int edition) {
+	insertEdition.FillRange(start, edition, length);
+}
+
+void ChangeLog::CollapseRange(Sci::Position position, Sci::Position deleteLength) {
+	const Sci::Position positionMax = position + deleteLength;
+	Sci::Position positionDeletion = position + 1;
+	while (positionDeletion <= positionMax) {
+		const EditionSetOwned &editions = deleteEdition.ValueAt(positionDeletion);
+		if (editions) {
+			for (const int ed : *editions) {
+				PushDeletionAt(position, ed);
+			}
+			EditionSetOwned empty;
+			deleteEdition.SetValueAt(positionDeletion, std::move(empty));
+		}
+		positionDeletion = deleteEdition.PositionNext(positionDeletion);
+	}
+}
+
+void ChangeLog::PushDeletionAt(Sci::Position position, int edition) {
+	if (!deleteEdition.ValueAt(position)) {
+		deleteEdition.SetValueAt(position, std::make_unique<EditionSet>());
+	}
+	deleteEdition.ValueAt(position)->push_back(edition);
+}
+
+void ChangeLog::InsertFrontDeletionAt(Sci::Position position, int edition) {
+	if (!deleteEdition.ValueAt(position)) {
+		deleteEdition.SetValueAt(position, std::make_unique<EditionSet>());
+	}
+	const EditionSetOwned &editions = deleteEdition.ValueAt(position);
+	editions->insert(editions->begin(), edition);
+}
+
+void ChangeLog::SaveRange(Sci::Position position, Sci::Position length) {
+	// Save insertEdition range into undo stack
+	changeStack.AddStep();
+	Sci::Position positionInsertion = position;
+	const ptrdiff_t editionStart = insertEdition.ValueAt(positionInsertion);
+	if (editionStart == 0) {
+		positionInsertion = insertEdition.EndRun(positionInsertion);
+	}
+	const Sci::Position positionMax = position + length;
+	while (positionInsertion < positionMax) {
+		const Sci::Position positionEndInsertion = insertEdition.EndRun(positionInsertion);
+		changeStack.PushInsertion(positionInsertion, std::min(positionEndInsertion, positionMax) - positionInsertion,
+			insertEdition.ValueAt(positionInsertion));
+		positionInsertion = insertEdition.EndRun(positionEndInsertion);
+	}
+	Sci::Position positionDeletion = position + 1;
+	while (positionDeletion <= positionMax) {
+		const EditionSetOwned &editions = deleteEdition.ValueAt(positionDeletion);
+		if (editions) {
+			for (const int ed : *editions) {
+				changeStack.PushDeletion(positionDeletion, ed);
+			}
+		}
+		positionDeletion = deleteEdition.PositionNext(positionDeletion);
+	}
+}
+
+void ChangeLog::PopDeletion(Sci::Position position, Sci::Position deleteLength) {
+	// Just performed InsertSpace(position, deleteLength) so *this* element in
+	// deleteEdition moved forward by deleteLength
+	EditionSetOwned eso = deleteEdition.Extract(position + deleteLength);
+	deleteEdition.SetValueAt(position, std::move(eso));
+	const EditionSetOwned &editions = deleteEdition.ValueAt(position);
+	assert(editions);
+	editions->pop_back();
+	const size_t inserts = changeStack.PopStep();
+	for (size_t i = 0; i < inserts; i++) {
+		const InsertionSpan span = changeStack.PopSpan();
+		if (span.direction == InsertionSpan::Direction::insertion) {
+			insertEdition.FillRange(span.start, span.edition, span.length);
+		} else {
+			assert(editions);
+			assert(editions->back() == span.edition);
+			editions->pop_back();
+			InsertFrontDeletionAt(span.start, span.edition);
+		}
+	}
+
+	if (editions->empty()) {
+		deleteEdition.SetValueAt(position, EditionSetOwned{});
+	}
+}
+
+void ChangeLog::SaveHistoryForDelete(Sci::Position position, Sci::Position deleteLength) {
+	assert(position >= 0);
+	assert(deleteLength >= 0);
+	assert(position + deleteLength <= Length());
+	SaveRange(position, deleteLength);
+	CollapseRange(position, deleteLength);
+}
+
+void ChangeLog::DeleteRangeSavingHistory(Sci::Position position, Sci::Position deleteLength) {
+	SaveHistoryForDelete(position, deleteLength);
+	DeleteRange(position, deleteLength);
+}
+
+void ChangeLog::SetSavePoint() {
+	// Switch changeUnsaved to changeSaved
+	changeStack.SetSavePoint();
+
+	const Sci::Position length = insertEdition.Length();
+
+	for (Sci::Position startRun = 0; startRun < length;) {
+		const Sci::Position endRun = insertEdition.EndRun(startRun);
+		if (insertEdition.ValueAt(startRun) == changeModified) {
+			insertEdition.FillRange(startRun, changeSaved, endRun - startRun);
+		}
+		startRun = endRun;
+	}
+	
+	for (Sci::Position positionDeletion = 0; positionDeletion <= length;) {
+		const EditionSetOwned &editions = deleteEdition.ValueAt(positionDeletion);
+		if (editions) {
+			for (int &ed : *editions) {
+				if (ed == changeModified) {
+					ed = changeSaved;
+				}
+			}
+		}
+		positionDeletion = deleteEdition.PositionNext(positionDeletion);
+	}
+}
+
+Sci::Position ChangeLog::Length() const noexcept {
+	return insertEdition.Length();
+}
+
+size_t ChangeLog::DeletionCount(Sci::Position start, Sci::Position length) const noexcept {
+	const Sci::Position end = start + length;
+	size_t count = 0;
+	while (start <= end) {
+		const EditionSetOwned &editions = deleteEdition.ValueAt(start);
+		if (editions) {
+			count += editions->size();
+		}
+		start = deleteEdition.PositionNext(start);
+	}
+	return count;
+}
+
+void ChangeLog::Check() const noexcept {
+	assert(insertEdition.Length() == deleteEdition.Length());
+}
+
+ChangeHistory::ChangeHistory(Sci::Position length) {
+	changeLog.Clear(length);
+}
+
+void ChangeHistory::Insert(Sci::Position position, Sci::Position insertLength, bool collectingUndo, bool beforeSave) {
+	Check();
+	changeLog.InsertSpace(position, insertLength);
+	const int edition = collectingUndo ? (beforeSave ? changeSaved : changeModified) :
+		changeOriginal;
+	changeLog.Insert(position, insertLength, edition);
+	if (changeLogReversions) {
+		changeLogReversions->InsertSpace(position, insertLength);
+		if (beforeSave) {
+			changeLogReversions->PopDeletion(position, insertLength);
+		}
+	}
+	Check();
+}
+
+void ChangeHistory::DeleteRange(Sci::Position position, Sci::Position deleteLength, bool reverting) {
+	Check();
+	assert(DeletionCount(position, deleteLength-1) == 0);
+	changeLog.DeleteRange(position, deleteLength);
+	if (changeLogReversions) {
+		changeLogReversions->DeleteRangeSavingHistory(position, deleteLength);
+		if (reverting) {
+			changeLogReversions->PushDeletionAt(position, 1);
+		}
+	}
+	Check();
+}
+
+void ChangeHistory::DeleteRangeSavingHistory(Sci::Position position, Sci::Position deleteLength, bool beforeSave, bool isDetached) {
+	changeLog.DeleteRangeSavingHistory(position, deleteLength);
+	changeLog.PushDeletionAt(position, beforeSave ? changeSaved : changeModified);
+	if (changeLogReversions) {
+		if (isDetached) {
+			changeLogReversions->SaveHistoryForDelete(position, deleteLength);
+		}
+		changeLogReversions->DeleteRange(position, deleteLength);
+	}
+	Check();
+}
+
+void ChangeHistory::StartReversion() {
+	if (!changeLogReversions) {
+		changeLogReversions = std::make_unique<ChangeLog>();
+		changeLogReversions->Clear(changeLog.Length());
+	}
+	Check();
+}
+
+void ChangeHistory::EndReversion() noexcept {
+	changeLogReversions.reset();
+	Check();
+}
+
+void ChangeHistory::SetSavePoint() {
+	changeLog.SetSavePoint();
+	EndReversion();
+}
+
+void ChangeHistory::UndoDeleteStep(Sci::Position position, Sci::Position deleteLength, bool isDetached) {
+	Check();
+	changeLog.InsertSpace(position, deleteLength);
+	changeLog.PopDeletion(position, deleteLength);
+	if (changeLogReversions) {
+		changeLogReversions->InsertSpace(position, deleteLength);
+		if (!isDetached) {
+			changeLogReversions->Insert(position, deleteLength, 1);
+		}
+	}
+	Check();
+}
+
+Sci::Position ChangeHistory::Length() const noexcept {
+	return changeLog.Length();
+}
+
+void ChangeHistory::SetEpoch(int epoch) noexcept {
+	historicEpoch = epoch;
+}
+
+void ChangeHistory::EditionCreateHistory(Sci::Position start, Sci::Position length) {
+	if (start <= changeLog.Length()) {
+		if (length) {
+			changeLog.insertEdition.FillRange(start, historicEpoch, length);
+		} else {
+			changeLog.PushDeletionAt(start, historicEpoch);
+		}
+	}
+}
+
+// Editions:
+// <0 History
+// 0 Original unchanged
+// 1 Reverted to origin
+// 2 Saved
+// 3 Unsaved
+// 4 Reverted to change
+int ChangeHistory::EditionAt(Sci::Position pos) const noexcept {
+	const int edition = changeLog.insertEdition.ValueAt(pos);
+	if (changeLogReversions) {
+		const int editionReversion = changeLogReversions->insertEdition.ValueAt(pos);
+		if (editionReversion) {
+			if (edition < 0)
+				return 1;
+			return edition ? 4 : 1;
+		}
+	}
+	return edition;
+}
+
+Sci::Position ChangeHistory::EditionEndRun(Sci::Position pos) const noexcept {
+	if (changeLogReversions) {
+		assert(changeLogReversions->Length() == changeLog.Length());
+		const Sci::Position nextReversion = changeLogReversions->insertEdition.EndRun(pos);
+		const Sci::Position next = changeLog.insertEdition.EndRun(pos);
+		return std::min(next, nextReversion);
+	}
+	return changeLog.insertEdition.EndRun(pos);
+}
+
+// Produce a 4-bit value from the deletions at a position
+unsigned int ChangeHistory::EditionDeletesAt(Sci::Position pos) const noexcept {
+	unsigned int editionSet = 0;
+	const EditionSetOwned &editionSetDeletions = changeLog.deleteEdition.ValueAt(pos);
+	if (editionSetDeletions) {
+		for (const unsigned int ed : *editionSetDeletions) {
+			editionSet = editionSet | (1u << (ed-1));
+		}
+	}
+	if (changeLogReversions) {
+		const EditionSetOwned &editionSetReversions = changeLogReversions->deleteEdition.ValueAt(pos);
+		if (editionSetReversions) {
+			// If there is no saved or modified -> revertedToOrigin
+			if (!(editionSet & (bitSaved | bitModified))) {
+				editionSet = editionSet | bitRevertedToOriginal;
+			} else {
+				editionSet = editionSet | bitRevertedToModified;
+			}
+		}
+	}
+	return editionSet;
+}
+
+Sci::Position ChangeHistory::EditionNextDelete(Sci::Position pos) const noexcept {
+	const Sci::Position next = changeLog.deleteEdition.PositionNext(pos);
+	if (changeLogReversions) {
+		const Sci::Position nextReversion = changeLogReversions->deleteEdition.PositionNext(pos);
+		return std::min(next, nextReversion);
+	}
+	return next;
+}
+
+size_t ChangeHistory::DeletionCount(Sci::Position start, Sci::Position length) const noexcept {
+	return changeLog.DeletionCount(start, length);
+}
+
+EditionSet ChangeHistory::DeletionsAt(Sci::Position pos) const {
+	const EditionSetOwned &editions = changeLog.deleteEdition.ValueAt(pos);
+	if (editions) {
+		return *editions;
+	}
+	return {};
+}
+
+void ChangeHistory::Check() noexcept {
+	changeLog.Check();
+	if (changeLogReversions) {
+		changeLogReversions->Check();
+		assert(changeLogReversions->Length() == changeLog.Length());
+	}
+}
+
+}
diff --git a/scintilla/src/ChangeHistory.h b/scintilla/src/ChangeHistory.h
new file mode 100644
index 000000000..8a6e745dc
--- /dev/null
+++ b/scintilla/src/ChangeHistory.h
@@ -0,0 +1,112 @@
+// Scintilla source code edit control
+/** @file ChangeHistory.h
+ ** Manages a history of changes in a document.
+ **/
+// Copyright 2022 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef CHANGEHISTORY_H
+#define CHANGEHISTORY_H
+
+namespace Scintilla::Internal {
+
+constexpr int changeOriginal = 0;
+constexpr int changeRevertedOriginal = 1;
+constexpr int changeSaved = 2;
+constexpr int changeModified = 3;
+constexpr int changeRevertedToChange = 4;
+
+// As bit flags
+constexpr unsigned int bitRevertedToOriginal = 1;
+constexpr unsigned int bitSaved = 2;
+constexpr unsigned int bitModified = 4;
+constexpr unsigned int bitRevertedToModified = 8;
+
+struct InsertionSpan {
+	Sci::Position start;
+	Sci::Position length;
+	int edition;
+	enum class Direction { insertion, deletion } direction;
+};
+
+using EditionSet = std::vector<int>;
+using EditionSetOwned = std::unique_ptr<EditionSet>;
+
+class ChangeStack {
+	std::vector<size_t> steps;
+	std::vector<InsertionSpan> insertions;
+public:
+	void Clear() noexcept;
+	void AddStep();
+	void PushDeletion(Sci::Position positionDeletion, int edition);
+	void PushInsertion(Sci::Position positionInsertion, Sci::Position length, int edition);
+	[[nodiscard]] size_t PopStep() noexcept;
+	[[nodiscard]] InsertionSpan PopSpan() noexcept;
+	void SetSavePoint() noexcept;
+};
+
+struct ChangeLog {
+	ChangeStack changeStack;
+	RunStyles<Sci::Position, int> insertEdition;
+	SparseVector<EditionSetOwned> deleteEdition;
+
+	void Clear(Sci::Position length);
+	void InsertSpace(Sci::Position position, Sci::Position insertLength);
+	void DeleteRange(Sci::Position position, Sci::Position deleteLength);
+	void Insert(Sci::Position start, Sci::Position length, int edition);
+	void CollapseRange(Sci::Position position, Sci::Position deleteLength);
+	void PushDeletionAt(Sci::Position position, int edition);
+	void InsertFrontDeletionAt(Sci::Position position, int edition);
+	void SaveRange(Sci::Position position, Sci::Position length);
+	void PopDeletion(Sci::Position position, Sci::Position deleteLength);
+	void SaveHistoryForDelete(Sci::Position position, Sci::Position deleteLength);
+	void DeleteRangeSavingHistory(Sci::Position position, Sci::Position deleteLength);
+	void SetSavePoint();
+
+	Sci::Position Length() const noexcept;
+	[[nodiscard]] size_t DeletionCount(Sci::Position start, Sci::Position length) const noexcept;
+	void Check() const noexcept;
+};
+
+enum class ReversionState { clear, reverting, detached };
+
+class ChangeHistory {
+	ChangeLog changeLog;
+	std::unique_ptr<ChangeLog> changeLogReversions;
+	int historicEpoch = -1;
+
+public:
+	ChangeHistory(Sci::Position length=0);
+
+	void Insert(Sci::Position position, Sci::Position insertLength, bool collectingUndo, bool beforeSave);
+	void DeleteRange(Sci::Position position, Sci::Position deleteLength, bool reverting);
+	void DeleteRangeSavingHistory(Sci::Position position, Sci::Position deleteLength, bool beforeSave, bool isDetached);
+
+	void StartReversion();
+	void EndReversion() noexcept;
+
+	void SetSavePoint();
+
+	void UndoDeleteStep(Sci::Position position, Sci::Position deleteLength, bool isDetached);
+
+	[[nodiscard]] Sci::Position Length() const noexcept;
+
+	// Setting up history before this session
+	void SetEpoch(int epoch) noexcept;
+	void EditionCreateHistory(Sci::Position start, Sci::Position length);
+
+	// Queries for drawing
+	[[nodiscard]] int EditionAt(Sci::Position pos) const noexcept;
+	[[nodiscard]] Sci::Position EditionEndRun(Sci::Position pos) const noexcept;
+	[[nodiscard]] unsigned int EditionDeletesAt(Sci::Position pos) const noexcept;
+	[[nodiscard]] Sci::Position EditionNextDelete(Sci::Position pos) const noexcept;
+
+	// Testing - not used by Scintilla
+	[[nodiscard]] size_t DeletionCount(Sci::Position start, Sci::Position length) const noexcept;
+	EditionSet DeletionsAt(Sci::Position pos) const;
+	void Check() noexcept;
+};
+
+}
+
+#endif
diff --git a/scintilla/src/ContractionState.cxx b/scintilla/src/ContractionState.cxx
index fcfe613a3..237f7670f 100644
--- a/scintilla/src/ContractionState.cxx
+++ b/scintilla/src/ContractionState.cxx
@@ -51,14 +51,14 @@ class ContractionState final : public IContractionState {
 	void InsertLine(Sci::Line lineDoc);
 	void DeleteLine(Sci::Line lineDoc);
 
+	// line_cast(): cast Sci::Line to either 32-bit or 64-bit value
+	// This avoids warnings from Visual C++ Code Analysis and shortens code
+	static constexpr LINE line_cast(Sci::Line line) noexcept {
+		return static_cast<LINE>(line);
+	}
+
 public:
 	ContractionState() noexcept;
-	// Deleted so ContractionState objects can not be copied.
-	ContractionState(const ContractionState &) = delete;
-	void operator=(const ContractionState &) = delete;
-	ContractionState(ContractionState &&) = delete;
-	void operator=(ContractionState &&) = delete;
-	~ContractionState() override;
 
 	void Clear() noexcept override;
 
@@ -80,6 +80,7 @@ public:
 
 	bool GetExpanded(Sci::Line lineDoc) const noexcept override;
 	bool SetExpanded(Sci::Line lineDoc, bool isExpanded) override;
+	bool ExpandAll() override;
 	Sci::Line ContractedNext(Sci::Line lineDocStart) const noexcept override;
 
 	int GetHeight(Sci::Line lineDoc) const noexcept override;
@@ -94,9 +95,6 @@ template <typename LINE>
 ContractionState<LINE>::ContractionState() noexcept : linesInDocument(1) {
 }
 
-template <typename LINE>
-ContractionState<LINE>::~ContractionState() = default;
-
 template <typename LINE>
 void ContractionState<LINE>::EnsureData() {
 	if (OneToOne()) {
@@ -114,7 +112,7 @@ void ContractionState<LINE>::InsertLine(Sci::Line lineDoc) {
 	if (OneToOne()) {
 		linesInDocument++;
 	} else {
-		const LINE lineDocCast = static_cast<LINE>(lineDoc);
+		const LINE lineDocCast = line_cast(lineDoc);
 		visible->InsertSpace(lineDocCast, 1);
 		visible->SetValueAt(lineDocCast, 1);
 		expanded->InsertSpace(lineDocCast, 1);
@@ -124,7 +122,7 @@ void ContractionState<LINE>::InsertLine(Sci::Line lineDoc) {
 		foldDisplayTexts->InsertSpace(lineDocCast, 1);
 		foldDisplayTexts->SetValueAt(lineDocCast, nullptr);
 		const Sci::Line lineDisplay = DisplayFromDoc(lineDoc);
-		displayLines->InsertPartition(lineDocCast, static_cast<LINE>(lineDisplay));
+		displayLines->InsertPartition(lineDocCast, line_cast(lineDisplay));
 		displayLines->InsertText(lineDocCast, 1);
 	}
 }
@@ -134,7 +132,7 @@ void ContractionState<LINE>::DeleteLine(Sci::Line lineDoc) {
 	if (OneToOne()) {
 		linesInDocument--;
 	} else {
-		const LINE lineDocCast = static_cast<LINE>(lineDoc);
+		const LINE lineDocCast = line_cast(lineDoc);
 		if (GetVisible(lineDoc)) {
 			displayLines->InsertText(lineDocCast, -heights->ValueAt(lineDocCast));
 		}
@@ -170,7 +168,7 @@ Sci::Line ContractionState<LINE>::LinesDisplayed() const noexcept {
 	if (OneToOne()) {
 		return linesInDocument;
 	} else {
-		return displayLines->PositionFromPartition(static_cast<LINE>(LinesInDoc()));
+		return displayLines->PositionFromPartition(line_cast(LinesInDoc()));
 	}
 }
 
@@ -181,7 +179,7 @@ Sci::Line ContractionState<LINE>::DisplayFromDoc(Sci::Line lineDoc) const noexce
 	} else {
 		if (lineDoc > displayLines->Partitions())
 			lineDoc = displayLines->Partitions();
-		return displayLines->PositionFromPartition(static_cast<LINE>(lineDoc));
+		return displayLines->PositionFromPartition(line_cast(lineDoc));
 	}
 }
 
@@ -199,9 +197,9 @@ Sci::Line ContractionState<LINE>::DocFromDisplay(Sci::Line lineDisplay) const no
 			return 0;
 		}
 		if (lineDisplay > LinesDisplayed()) {
-			return displayLines->PartitionFromPosition(static_cast<LINE>(LinesDisplayed()));
+			return displayLines->PartitionFromPosition(line_cast(LinesDisplayed()));
 		}
-		const Sci::Line lineDoc = displayLines->PartitionFromPosition(static_cast<LINE>(lineDisplay));
+		const Sci::Line lineDoc = displayLines->PartitionFromPosition(line_cast(lineDisplay));
 		PLATFORM_ASSERT(GetVisible(lineDoc));
 		return lineDoc;
 	}
@@ -210,7 +208,7 @@ Sci::Line ContractionState<LINE>::DocFromDisplay(Sci::Line lineDisplay) const no
 template <typename LINE>
 void ContractionState<LINE>::InsertLines(Sci::Line lineDoc, Sci::Line lineCount) {
 	if (OneToOne()) {
-		linesInDocument += static_cast<LINE>(lineCount);
+		linesInDocument += line_cast(lineCount);
 	} else {
 		for (Sci::Line l = 0; l < lineCount; l++) {
 			InsertLine(lineDoc + l);
@@ -222,7 +220,7 @@ void ContractionState<LINE>::InsertLines(Sci::Line lineDoc, Sci::Line lineCount)
 template <typename LINE>
 void ContractionState<LINE>::DeleteLines(Sci::Line lineDoc, Sci::Line lineCount) {
 	if (OneToOne()) {
-		linesInDocument -= static_cast<LINE>(lineCount);
+		linesInDocument -= line_cast(lineCount);
 	} else {
 		for (Sci::Line l = 0; l < lineCount; l++) {
 			DeleteLine(lineDoc);
@@ -238,7 +236,7 @@ bool ContractionState<LINE>::GetVisible(Sci::Line lineDoc) const noexcept {
 	} else {
 		if (lineDoc >= visible->Length())
 			return true;
-		return visible->ValueAt(static_cast<LINE>(lineDoc)) == 1;
+		return visible->ValueAt(line_cast(lineDoc)) == 1;
 	}
 }
 
@@ -248,23 +246,26 @@ bool ContractionState<LINE>::SetVisible(Sci::Line lineDocStart, Sci::Line lineDo
 		return false;
 	} else {
 		EnsureData();
-		Sci::Line delta = 0;
 		Check();
 		if ((lineDocStart <= lineDocEnd) && (lineDocStart >= 0) && (lineDocEnd < LinesInDoc())) {
+			bool changed = false;
 			for (Sci::Line line = lineDocStart; line <= lineDocEnd; line++) {
 				if (GetVisible(line) != isVisible) {
-					const int heightLine = heights->ValueAt(static_cast<LINE>(line));
+					changed = true;
+					const int heightLine = heights->ValueAt(line_cast(line));
 					const int difference = isVisible ? heightLine : -heightLine;
-					visible->SetValueAt(static_cast<LINE>(line), isVisible ? 1 : 0);
-					displayLines->InsertText(static_cast<LINE>(line), difference);
-					delta += difference;
+					displayLines->InsertText(line_cast(line), difference);
 				}
 			}
+			if (changed) {
+				visible->FillRange(line_cast(lineDocStart), isVisible ? 1 : 0,
+					line_cast(lineDocEnd - lineDocStart) + 1);
+			}
+			Check();
+			return changed;
 		} else {
 			return false;
 		}
-		Check();
-		return delta != 0;
 	}
 }
 
@@ -304,7 +305,7 @@ bool ContractionState<LINE>::GetExpanded(Sci::Line lineDoc) const noexcept {
 		return true;
 	} else {
 		Check();
-		return expanded->ValueAt(static_cast<LINE>(lineDoc)) == 1;
+		return expanded->ValueAt(line_cast(lineDoc)) == 1;
 	}
 }
 
@@ -314,8 +315,8 @@ bool ContractionState<LINE>::SetExpanded(Sci::Line lineDoc, bool isExpanded) {
 		return false;
 	} else {
 		EnsureData();
-		if (isExpanded != (expanded->ValueAt(static_cast<LINE>(lineDoc)) == 1)) {
-			expanded->SetValueAt(static_cast<LINE>(lineDoc), isExpanded ? 1 : 0);
+		if (isExpanded != (expanded->ValueAt(line_cast(lineDoc)) == 1)) {
+			expanded->SetValueAt(line_cast(lineDoc), isExpanded ? 1 : 0);
 			Check();
 			return true;
 		} else {
@@ -325,16 +326,28 @@ bool ContractionState<LINE>::SetExpanded(Sci::Line lineDoc, bool isExpanded) {
 	}
 }
 
+template <typename LINE>
+bool ContractionState<LINE>::ExpandAll() {
+	if (OneToOne()) {
+		return false;
+	} else {
+		const LINE lines = expanded->Length();
+		const bool changed = expanded->FillRange(0, 1, lines).changed;
+		Check();
+		return changed;
+	}
+}
+
 template <typename LINE>
 Sci::Line ContractionState<LINE>::ContractedNext(Sci::Line lineDocStart) const noexcept {
 	if (OneToOne()) {
 		return -1;
 	} else {
 		Check();
-		if (!expanded->ValueAt(static_cast<LINE>(lineDocStart))) {
+		if (!expanded->ValueAt(line_cast(lineDocStart))) {
 			return lineDocStart;
 		} else {
-			const Sci::Line lineDocNextChange = expanded->EndRun(static_cast<LINE>(lineDocStart));
+			const Sci::Line lineDocNextChange = expanded->EndRun(line_cast(lineDocStart));
 			if (lineDocNextChange < LinesInDoc())
 				return lineDocNextChange;
 			else
@@ -348,7 +361,7 @@ int ContractionState<LINE>::GetHeight(Sci::Line lineDoc) const noexcept {
 	if (OneToOne()) {
 		return 1;
 	} else {
-		return heights->ValueAt(static_cast<LINE>(lineDoc));
+		return heights->ValueAt(line_cast(lineDoc));
 	}
 }
 
@@ -362,9 +375,9 @@ bool ContractionState<LINE>::SetHeight(Sci::Line lineDoc, int height) {
 		EnsureData();
 		if (GetHeight(lineDoc) != height) {
 			if (GetVisible(lineDoc)) {
-				displayLines->InsertText(static_cast<LINE>(lineDoc), height - GetHeight(lineDoc));
+				displayLines->InsertText(line_cast(lineDoc), height - GetHeight(lineDoc));
 			}
-			heights->SetValueAt(static_cast<LINE>(lineDoc), height);
+			heights->SetValueAt(line_cast(lineDoc), height);
 			Check();
 			return true;
 		} else {
@@ -378,7 +391,7 @@ bool ContractionState<LINE>::SetHeight(Sci::Line lineDoc, int height) {
 
 template <typename LINE>
 void ContractionState<LINE>::ShowAll() noexcept {
-	const LINE lines = static_cast<LINE>(LinesInDoc());
+	const LINE lines = line_cast(LinesInDoc());
 	Clear();
 	linesInDocument = lines;
 }
diff --git a/scintilla/src/ContractionState.h b/scintilla/src/ContractionState.h
index c238a10e8..727d2a9dd 100644
--- a/scintilla/src/ContractionState.h
+++ b/scintilla/src/ContractionState.h
@@ -36,6 +36,7 @@ public:
 
 	virtual bool GetExpanded(Sci::Line lineDoc) const noexcept=0;
 	virtual bool SetExpanded(Sci::Line lineDoc, bool isExpanded)=0;
+	virtual bool ExpandAll()=0;
 	virtual Sci::Line ContractedNext(Sci::Line lineDocStart) const noexcept =0;
 
 	virtual int GetHeight(Sci::Line lineDoc) const noexcept=0;
diff --git a/scintilla/src/Decoration.cxx b/scintilla/src/Decoration.cxx
index 30b37486b..0dbc0d638 100644
--- a/scintilla/src/Decoration.cxx
+++ b/scintilla/src/Decoration.cxx
@@ -34,6 +34,13 @@ namespace {
 template <typename POS>
 class Decoration : public IDecoration {
 	int indicator;
+
+	// pos_cast(): cast Sci::Position to either 32-bit or 64-bit value
+	// This avoids warnings from Visual C++ Code Analysis and shortens code
+	static constexpr POS pos_cast(Sci::Position pos) noexcept {
+		return static_cast<POS>(pos);
+	}
+
 public:
 	RunStyles<POS, int> rs;
 
@@ -50,19 +57,19 @@ public:
 		return rs.Length();
 	}
 	int ValueAt(Sci::Position position) const noexcept override {
-		return rs.ValueAt(static_cast<POS>(position));
+		return rs.ValueAt(pos_cast(position));
 	}
 	Sci::Position StartRun(Sci::Position position) const noexcept override {
-		return rs.StartRun(static_cast<POS>(position));
+		return rs.StartRun(pos_cast(position));
 	}
 	Sci::Position EndRun(Sci::Position position) const noexcept override {
-		return rs.EndRun(static_cast<POS>(position));
+		return rs.EndRun(pos_cast(position));
 	}
 	void SetValueAt(Sci::Position position, int value) override {
-		rs.SetValueAt(static_cast<POS>(position), value);
+		rs.SetValueAt(pos_cast(position), value);
 	}
 	void InsertSpace(Sci::Position position, Sci::Position insertLength) override {
-		rs.InsertSpace(static_cast<POS>(position), static_cast<POS>(insertLength));
+		rs.InsertSpace(pos_cast(position), pos_cast(insertLength));
 	}
 	Sci::Position Runs() const noexcept override {
 		return rs.Runs();
@@ -85,6 +92,13 @@ class DecorationList : public IDecorationList {
 	void Delete(int indicator);
 	void DeleteAnyEmpty();
 	void SetView();
+
+	// pos_cast(): cast Sci::Position to either 32-bit or 64-bit value
+	// This avoids warnings from Visual C++ Code Analysis and shortens code
+	static constexpr POS pos_cast(Sci::Position pos) noexcept {
+		return static_cast<POS>(pos);
+	}
+
 public:
 
 	DecorationList();
@@ -96,7 +110,7 @@ public:
 	void SetCurrentIndicator(int indicator) override;
 	int GetCurrentIndicator() const noexcept override { return currentIndicator; }
 
-	void SetCurrentValue(int value) override;
+	void SetCurrentValue(int value) noexcept override;
 	int GetCurrentValue() const noexcept override { return currentValue; }
 
 	// Returns changed=true if some values may have changed
@@ -139,7 +153,7 @@ template <typename POS>
 Decoration<POS> *DecorationList<POS>::Create(int indicator, Sci::Position length) {
 	currentIndicator = indicator;
 	std::unique_ptr<Decoration<POS>> decoNew = std::make_unique<Decoration<POS>>(indicator);
-	decoNew->rs.InsertSpace(0, static_cast<POS>(length));
+	decoNew->rs.InsertSpace(0, pos_cast(length));
 
 	typename std::vector<std::unique_ptr<Decoration<POS>>>::iterator it = std::lower_bound(
 		decorationList.begin(), decorationList.end(), decoNew,
@@ -172,7 +186,7 @@ void DecorationList<POS>::SetCurrentIndicator(int indicator) {
 }
 
 template <typename POS>
-void DecorationList<POS>::SetCurrentValue(int value) {
+void DecorationList<POS>::SetCurrentValue(int value) noexcept {
 	currentValue = value ? value : 1;
 }
 
@@ -185,9 +199,9 @@ FillResult<Sci::Position> DecorationList<POS>::FillRange(Sci::Position position,
 		}
 	}
 	// Converting result from POS to Sci::Position as callers not polymorphic.
-	const FillResult<POS> frInPOS = current->rs.FillRange(static_cast<POS>(position), value, static_cast<POS>(fillLength));
+	const FillResult<POS> frInPOS = current->rs.FillRange(pos_cast(position), value, pos_cast(fillLength));
 	const FillResult<Sci::Position> fr { frInPOS.changed, frInPOS.position, frInPOS.fillLength };
-		if (current->Empty()) {
+	if (current->Empty()) {
 		Delete(currentIndicator);
 	}
 	return fr;
@@ -198,9 +212,9 @@ void DecorationList<POS>::InsertSpace(Sci::Position position, Sci::Position inse
 	const bool atEnd = position == lengthDocument;
 	lengthDocument += insertLength;
 	for (const std::unique_ptr<Decoration<POS>> &deco : decorationList) {
-		deco->rs.InsertSpace(static_cast<POS>(position), static_cast<POS>(insertLength));
+		deco->rs.InsertSpace(pos_cast(position), pos_cast(insertLength));
 		if (atEnd) {
-			deco->rs.FillRange(static_cast<POS>(position), 0, static_cast<POS>(insertLength));
+			deco->rs.FillRange(pos_cast(position), 0, pos_cast(insertLength));
 		}
 	}
 }
@@ -209,7 +223,7 @@ template <typename POS>
 void DecorationList<POS>::DeleteRange(Sci::Position position, Sci::Position deleteLength) {
 	lengthDocument -= deleteLength;
 	for (const std::unique_ptr<Decoration<POS>> &deco : decorationList) {
-		deco->rs.DeleteRange(static_cast<POS>(position), static_cast<POS>(deleteLength));
+		deco->rs.DeleteRange(pos_cast(position), pos_cast(deleteLength));
 	}
 	DeleteAnyEmpty();
 	if (decorationList.size() != decorationView.size()) {
@@ -253,7 +267,7 @@ template <typename POS>
 int DecorationList<POS>::AllOnFor(Sci::Position position) const noexcept {
 	int mask = 0;
 	for (const std::unique_ptr<Decoration<POS>> &deco : decorationList) {
-		if (deco->rs.ValueAt(static_cast<POS>(position))) {
+		if (deco->rs.ValueAt(pos_cast(position))) {
 			if (deco->Indicator() < static_cast<int>(Scintilla::IndicatorNumbers::Ime)) {
 				mask |= 1u << deco->Indicator();
 			}
@@ -266,7 +280,7 @@ template <typename POS>
 int DecorationList<POS>::ValueAt(int indicator, Sci::Position position) noexcept {
 	const Decoration<POS> *deco = DecorationFromIndicator(indicator);
 	if (deco) {
-		return deco->rs.ValueAt(static_cast<POS>(position));
+		return deco->rs.ValueAt(pos_cast(position));
 	}
 	return 0;
 }
@@ -275,7 +289,7 @@ template <typename POS>
 Sci::Position DecorationList<POS>::Start(int indicator, Sci::Position position) noexcept {
 	const Decoration<POS> *deco = DecorationFromIndicator(indicator);
 	if (deco) {
-		return deco->rs.StartRun(static_cast<POS>(position));
+		return deco->rs.StartRun(pos_cast(position));
 	}
 	return 0;
 }
@@ -284,7 +298,7 @@ template <typename POS>
 Sci::Position DecorationList<POS>::End(int indicator, Sci::Position position) noexcept {
 	const Decoration<POS> *deco = DecorationFromIndicator(indicator);
 	if (deco) {
-		return deco->rs.EndRun(static_cast<POS>(position));
+		return deco->rs.EndRun(pos_cast(position));
 	}
 	return 0;
 }
diff --git a/scintilla/src/Decoration.h b/scintilla/src/Decoration.h
index d1e51ef7d..afe9d1b66 100644
--- a/scintilla/src/Decoration.h
+++ b/scintilla/src/Decoration.h
@@ -32,7 +32,7 @@ public:
 	virtual void SetCurrentIndicator(int indicator) = 0;
 	virtual int GetCurrentIndicator() const noexcept = 0;
 
-	virtual void SetCurrentValue(int value) = 0;
+	virtual void SetCurrentValue(int value) noexcept = 0;
 	virtual int GetCurrentValue() const noexcept = 0;
 
 	// Returns with changed=true if some values may have changed
diff --git a/scintilla/src/Document.cxx b/scintilla/src/Document.cxx
index a26f7348f..98e9095f5 100644
--- a/scintilla/src/Document.cxx
+++ b/scintilla/src/Document.cxx
@@ -339,8 +339,32 @@ void Document::TentativeUndo() {
 	}
 }
 
-int Document::GetMark(Sci::Line line) const noexcept {
-	return Markers()->MarkValue(line);
+int Document::GetMark(Sci::Line line, bool includeChangeHistory) const {
+	int marksHistory = 0;
+	if (includeChangeHistory && (line < LinesTotal())) {
+		int marksEdition = 0;
+
+		const Sci::Position start = LineStart(line);
+		const Sci::Position lineNext = LineStart(line + 1);
+		for (Sci::Position position = start; position < lineNext;) {
+			const int edition = EditionAt(position);
+			if (edition) {
+				marksEdition |= 1 << (edition-1);
+			}
+			position = EditionEndRun(position);
+		}
+		const Sci::Position lineEnd = LineEnd(line);
+		for (Sci::Position position = start; position <= lineEnd;) {
+			marksEdition |= EditionDeletesAt(position);
+			position = EditionNextDelete(position);
+		}
+
+		/* Bits: RevertedToOrigin, Saved, Modified, RevertedToModified */
+		constexpr unsigned int editionShift = static_cast<unsigned int>(MarkerOutline::HistoryRevertedToOrigin);
+		marksHistory = marksEdition << editionShift;
+	}
+
+	return marksHistory | Markers()->MarkValue(line);
 }
 
 Sci::Line Document::MarkerNext(Sci::Line lineStart, int mask) const noexcept {
@@ -348,7 +372,7 @@ Sci::Line Document::MarkerNext(Sci::Line lineStart, int mask) const noexcept {
 }
 
 int Document::AddMark(Sci::Line line, int markerNum) {
-	if (line >= 0 && line <= LinesTotal()) {
+	if (line >= 0 && line < LinesTotal()) {
 		const int prev = Markers()->AddMark(line, markerNum, LinesTotal());
 		const DocModification mh(ModificationFlags::ChangeMarker, LineStart(line), 0, 0, nullptr, line);
 		NotifyModified(mh);
@@ -359,7 +383,7 @@ int Document::AddMark(Sci::Line line, int markerNum) {
 }
 
 void Document::AddMarkSet(Sci::Line line, int valueSet) {
-	if (line < 0 || line > LinesTotal()) {
+	if (line < 0 || line >= LinesTotal()) {
 		return;
 	}
 	unsigned int m = valueSet;
@@ -2424,7 +2448,7 @@ void Document::SetLexInterface(std::unique_ptr<LexInterface> pLexInterface) noex
 }
 
 int SCI_METHOD Document::SetLineState(Sci_Position line, int state) {
-	const int statePrevious = States()->SetLineState(line, state);
+	const int statePrevious = States()->SetLineState(line, state, LinesTotal());
 	if (state != statePrevious) {
 		const DocModification mh(ModificationFlags::ChangeLineState, LineStart(line), 0, 0, nullptr,
 			static_cast<Sci::Line>(line));
@@ -3162,6 +3186,10 @@ Sci::Position Cxx11RegexFindText(const Document *doc, Sci::Position minPos, Sci:
 		if (!caseSensitive)
 			flagsRe = flagsRe | std::regex::icase;
 
+#if defined(REGEX_MULTILINE) && !defined(_MSC_VER)
+		flagsRe = flagsRe | std::regex::multiline;
+#endif
+
 		// Clear the RESearch so can fill in matches
 		search.Clear();
 
diff --git a/scintilla/src/Document.h b/scintilla/src/Document.h
index 91313b42d..1c4dfdaa9 100644
--- a/scintilla/src/Document.h
+++ b/scintilla/src/Document.h
@@ -383,6 +383,12 @@ public:
 	void TentativeUndo();
 	bool TentativeActive() const noexcept { return cb.TentativeActive(); }
 
+	void ChangeHistorySet(bool set) { cb.ChangeHistorySet(set); }
+	[[nodiscard]] int EditionAt(Sci::Position pos) const noexcept { return cb.EditionAt(pos); }
+	[[nodiscard]] Sci::Position EditionEndRun(Sci::Position pos) const noexcept { return cb.EditionEndRun(pos); }
+	[[nodiscard]] unsigned int EditionDeletesAt(Sci::Position pos) const noexcept { return cb.EditionDeletesAt(pos); }
+	[[nodiscard]] Sci::Position EditionNextDelete(Sci::Position pos) const noexcept { return cb.EditionNextDelete(pos); }
+
 	const char * SCI_METHOD BufferPointer() override { return cb.BufferPointer(); }
 	const char *RangePointer(Sci::Position position, Sci::Position rangeLength) noexcept { return cb.RangePointer(position, rangeLength); }
 	Sci::Position GapPosition() const noexcept { return cb.GapPosition(); }
@@ -414,7 +420,7 @@ public:
 	void GetStyleRange(unsigned char *buffer, Sci::Position position, Sci::Position lengthRetrieve) const {
 		cb.GetStyleRange(buffer, position, lengthRetrieve);
 	}
-	int GetMark(Sci::Line line) const noexcept;
+	int GetMark(Sci::Line line, bool includeChangeHistory) const;
 	Sci::Line MarkerNext(Sci::Line lineStart, int mask) const noexcept;
 	int AddMark(Sci::Line line, int markerNum);
 	void AddMarkSet(Sci::Line line, int valueSet);
diff --git a/scintilla/src/EditModel.cxx b/scintilla/src/EditModel.cxx
index 50aa88b06..dd441322e 100644
--- a/scintilla/src/EditModel.cxx
+++ b/scintilla/src/EditModel.cxx
@@ -126,3 +126,7 @@ InSelection EditModel::LineEndInSelection(Sci::Line lineDoc) const {
 	const Sci::Position posAfterLineEnd = pdoc->LineStart(lineDoc + 1);
 	return sel.InSelectionForEOL(posAfterLineEnd);
 }
+
+int EditModel::GetMark(Sci::Line line) const {
+	return pdoc->GetMark(line, FlagSet(changeHistoryOption, ChangeHistoryOption::Markers));
+}
diff --git a/scintilla/src/EditModel.h b/scintilla/src/EditModel.h
index 64005a504..f62c28b1f 100644
--- a/scintilla/src/EditModel.h
+++ b/scintilla/src/EditModel.h
@@ -49,6 +49,8 @@ public:
 	bool hotspotSingleLine;
 	Sci::Position hoverIndicatorPos;
 
+	Scintilla::ChangeHistoryOption changeHistoryOption = Scintilla::ChangeHistoryOption::Disabled;
+
 	// Wrapping support
 	int wrapWidth;
 
@@ -61,7 +63,7 @@ public:
 	EditModel &operator=(const EditModel &) = delete;
 	EditModel &operator=(EditModel &&) = delete;
 	virtual ~EditModel();
-	virtual Sci::Line TopLineOfMain() const = 0;
+	virtual Sci::Line TopLineOfMain() const noexcept = 0;
 	virtual Point GetVisibleOriginInMain() const = 0;
 	virtual Sci::Line LinesOnScreen() const = 0;
 	bool BidirectionalEnabled() const noexcept;
@@ -71,6 +73,7 @@ public:
 	const char *GetDefaultFoldDisplayText() const noexcept;
 	const char *GetFoldDisplayText(Sci::Line lineDoc) const noexcept;
 	InSelection LineEndInSelection(Sci::Line lineDoc) const;
+	[[nodiscard]] int GetMark(Sci::Line line) const;
 };
 
 }
diff --git a/scintilla/src/EditView.cxx b/scintilla/src/EditView.cxx
index bce76672a..a7b98e233 100644
--- a/scintilla/src/EditView.cxx
+++ b/scintilla/src/EditView.cxx
@@ -185,7 +185,6 @@ void Hexits(char *hexits, int ch) noexcept {
 
 EditView::EditView() {
 	tabWidthMinimumPixels = 2; // needed for calculating tab stops for fractional proportional fonts
-	hideSelection = false;
 	drawOverstrikeCaret = true;
 	bufferedDraw = true;
 	phasesDraw = PhasesDraw::Two;
@@ -537,7 +536,7 @@ void EditView::LayoutLine(const EditModel &model, Surface *surface, const ViewSt
 			segments.push_back(bfLayout.Next());
 		}
 
-		std::fill(&ll->positions[0], &ll->positions[numCharsInLine], 0.0f);
+		ll->ClearPositions();
 
 		if (!segments.empty()) {
 
@@ -688,8 +687,7 @@ void EditView::LayoutLine(const EditModel &model, Surface *surface, const ViewSt
 						}
 					}
 					lastLineStart = lastGoodBreak;
-					ll->lines++;
-					ll->SetLineStart(ll->lines, static_cast<int>(lastLineStart));
+					ll->AddLineStart(lastLineStart);
 					startOffset = ll->positions[lastLineStart];
 					// take into account the space for start wrap mark and indent
 					startOffset += width - ll->wrapIndent;
@@ -713,7 +711,7 @@ void EditView::UpdateBidiData(const EditModel &model, const ViewStyle &vstyle, L
 		ll->bidiData->stylesFonts[ll->numCharsInLine].reset();
 
 		for (int charsInLine = 0; charsInLine < ll->numCharsInLine; charsInLine++) {
-			const int charWidth = UTF8DrawBytes(reinterpret_cast<unsigned char *>(&ll->chars[charsInLine]), ll->numCharsInLine - charsInLine);
+			const int charWidth = UTF8DrawBytes(&ll->chars[charsInLine], ll->numCharsInLine - charsInLine);
 			const Representation *repr = model.reprs.RepresentationFromCharacter(std::string_view(&ll->chars[charsInLine], charWidth));
 
 			ll->bidiData->widthReprs[charsInLine] = 0.0f;
@@ -1076,7 +1074,7 @@ void EditView::DrawEOL(Surface *surface, const EditModel &model, const ViewStyle
 		rcSegment.right = xEol + xStart + virtualSpace;
 		const ColourRGBA backgroundFill = background.value_or(vsDraw.styles[ll->styles[ll->numCharsInLine]].back);
 		surface->FillRectangleAligned(rcSegment, backgroundFill);
-		if (!hideSelection && (vsDraw.selection.layer == Layer::Base)) {
+		if (vsDraw.selection.visible && (vsDraw.selection.layer == Layer::Base)) {
 			const SelectionSegment virtualSpaceRange(SelectionPosition(model.pdoc->LineEnd(line)),
 				SelectionPosition(model.pdoc->LineEnd(line),
 					model.sel.VirtualSpaceFor(model.pdoc->LineEnd(line))));
@@ -1098,7 +1096,7 @@ void EditView::DrawEOL(Surface *surface, const EditModel &model, const ViewStyle
 	}
 
 	InSelection eolInSelection = InSelection::inNone;
-	if (!hideSelection && lastSubLine) {
+	if (vsDraw.selection.visible && lastSubLine) {
 		eolInSelection = model.LineEndInSelection(line);
 	}
 
@@ -1240,14 +1238,13 @@ static void DrawIndicator(int indicNum, Sci::Position startPos, Sci::Position en
 	int value, bool bidiEnabled, int tabWidthMinimumPixels) {
 
 	const XYPOSITION subLineStart = ll->positions[ll->LineStart(subLine)];
+	const XYPOSITION horizontalOffset = xStart - subLineStart;
 
 	std::vector<PRectangle> rectangles;
 
-	const PRectangle rcIndic(
-		ll->positions[startPos] + xStart - subLineStart,
-		rcLine.top + vsDraw.maxAscent,
-		ll->positions[endPos] + xStart - subLineStart,
-		rcLine.top + vsDraw.maxAscent + 3);
+	const XYPOSITION left = ll->XInLine(startPos) + horizontalOffset;
+	const XYPOSITION right = ll->XInLine(endPos) + horizontalOffset;
+	const PRectangle rcIndic(left, rcLine.top + vsDraw.maxAscent, right, rcLine.top + vsDraw.maxAscent + 3);
 
 	if (bidiEnabled) {
 		ScreenLine screenLine(ll, subLine, vsDraw, rcLine.right - xStart, tabWidthMinimumPixels);
@@ -1271,7 +1268,7 @@ static void DrawIndicator(int indicNum, Sci::Position startPos, Sci::Position en
 		// Allow full descent space for character indicators
 		rcFirstCharacter.bottom = rcLine.top + vsDraw.maxAscent + vsDraw.maxDescent;
 		if (secondCharacter >= 0) {
-			rcFirstCharacter.right = ll->positions[secondCharacter] + xStart - subLineStart;
+			rcFirstCharacter.right = ll->XInLine(secondCharacter) + horizontalOffset;
 		} else {
 			// Indicator continued from earlier line so make an empty box and don't draw
 			rcFirstCharacter.right = rcFirstCharacter.left;
@@ -1290,24 +1287,20 @@ static void DrawIndicators(Surface *surface, const EditModel &model, const ViewS
 	for (const IDecoration *deco : model.pdoc->decorations->View()) {
 		if (under == vsDraw.indicators[deco->Indicator()].under) {
 			Sci::Position startPos = posLineStart + lineStart;
-			if (!deco->ValueAt(startPos)) {
-				startPos = deco->EndRun(startPos);
-			}
-			while ((startPos < posLineEnd) && (deco->ValueAt(startPos))) {
+			while (startPos < posLineEnd) {
 				const Range rangeRun(deco->StartRun(startPos), deco->EndRun(startPos));
 				const Sci::Position endPos = std::min(rangeRun.end, posLineEnd);
-				const bool hover = vsDraw.indicators[deco->Indicator()].IsDynamic() &&
-					rangeRun.ContainsCharacter(model.hoverIndicatorPos);
 				const int value = deco->ValueAt(startPos);
-				const Indicator::State state = hover ? Indicator::State::hover : Indicator::State::normal;
-				const Sci::Position posSecond = model.pdoc->MovePositionOutsideChar(rangeRun.First() + 1, 1);
-				DrawIndicator(deco->Indicator(), startPos - posLineStart, endPos - posLineStart,
-					surface, vsDraw, ll, xStart, rcLine, posSecond - posLineStart, subLine, state,
-					value, model.BidirectionalEnabled(), tabWidthMinimumPixels);
-				startPos = endPos;
-				if (!deco->ValueAt(startPos)) {
-					startPos = deco->EndRun(startPos);
+				if (value) {
+					const bool hover = vsDraw.indicators[deco->Indicator()].IsDynamic() &&
+						rangeRun.ContainsCharacter(model.hoverIndicatorPos);
+					const Indicator::State state = hover ? Indicator::State::hover : Indicator::State::normal;
+					const Sci::Position posSecond = model.pdoc->MovePositionOutsideChar(rangeRun.First() + 1, 1);
+					DrawIndicator(deco->Indicator(), startPos - posLineStart, endPos - posLineStart,
+						surface, vsDraw, ll, xStart, rcLine, posSecond - posLineStart, subLine, state,
+						value, model.BidirectionalEnabled(), tabWidthMinimumPixels);
 				}
+				startPos = endPos;
 			}
 		}
 	}
@@ -1318,21 +1311,55 @@ static void DrawIndicators(Surface *surface, const EditModel &model, const ViewS
 		const int braceIndicator = (model.bracesMatchStyle == StyleBraceLight) ? vsDraw.braceHighlightIndicator : vsDraw.braceBadLightIndicator;
 		if (under == vsDraw.indicators[braceIndicator].under) {
 			const Range rangeLine(posLineStart + lineStart, posLineEnd);
-			if (rangeLine.ContainsCharacter(model.braces[0])) {
-				const Sci::Position braceOffset = model.braces[0] - posLineStart;
-				if (braceOffset < ll->numCharsInLine) {
-					const Sci::Position secondOffset = model.pdoc->MovePositionOutsideChar(model.braces[0] + 1, 1) - posLineStart;
-					DrawIndicator(braceIndicator, braceOffset, braceOffset + 1, surface, vsDraw, ll, xStart, rcLine, secondOffset,
-						subLine, Indicator::State::normal, 1, model.BidirectionalEnabled(), tabWidthMinimumPixels);
+			for (size_t brace = 0; brace <= 1; brace++) {
+				if (rangeLine.ContainsCharacter(model.braces[brace])) {
+					const Sci::Position braceOffset = model.braces[brace] - posLineStart;
+					if (braceOffset < ll->numCharsInLine) {
+						const Sci::Position braceEnd = model.pdoc->MovePositionOutsideChar(model.braces[brace] + 1, 1) - posLineStart;
+						DrawIndicator(braceIndicator, braceOffset, braceEnd,
+							surface, vsDraw, ll, xStart, rcLine, braceEnd, subLine, Indicator::State::normal,
+							1, model.BidirectionalEnabled(), tabWidthMinimumPixels);
+					}
 				}
 			}
-			if (rangeLine.ContainsCharacter(model.braces[1])) {
-				const Sci::Position braceOffset = model.braces[1] - posLineStart;
-				if (braceOffset < ll->numCharsInLine) {
-					const Sci::Position secondOffset = model.pdoc->MovePositionOutsideChar(model.braces[1] + 1, 1) - posLineStart;
-					DrawIndicator(braceIndicator, braceOffset, braceOffset + 1, surface, vsDraw, ll, xStart, rcLine, secondOffset,
-						subLine, Indicator::State::normal, 1, model.BidirectionalEnabled(), tabWidthMinimumPixels);
+		}
+	}
+
+	if (FlagSet(model.changeHistoryOption, ChangeHistoryOption::Indicators)) {
+		// Draw editions
+		constexpr int indexHistory = static_cast<int>(IndicatorNumbers::HistoryRevertedToOriginInsertion);
+		{
+			// Draw insertions
+			Sci::Position startPos = posLineStart + lineStart;
+			while (startPos < posLineEnd) {
+				const Range rangeRun(startPos, model.pdoc->EditionEndRun(startPos));
+				const Sci::Position endPos = std::min(rangeRun.end, posLineEnd);
+				const int edition = model.pdoc->EditionAt(startPos);
+				if (edition != 0) {
+					const int indicator = (edition - 1) * 2 + indexHistory;
+					const Sci::Position posSecond = model.pdoc->MovePositionOutsideChar(rangeRun.First() + 1, 1);
+					DrawIndicator(indicator, startPos - posLineStart, endPos - posLineStart,
+						surface, vsDraw, ll, xStart, rcLine, posSecond - posLineStart, subLine, Indicator::State::normal,
+						1, model.BidirectionalEnabled(), tabWidthMinimumPixels);
 				}
+				startPos = endPos;
+			}
+		}
+		{
+			// Draw deletions
+			Sci::Position startPos = posLineStart + lineStart;
+			while (startPos <= posLineEnd) {
+				const unsigned int editions = model.pdoc->EditionDeletesAt(startPos);
+				const Sci::Position posSecond = model.pdoc->MovePositionOutsideChar(startPos + 1, 1);
+				for (unsigned int edition=0; edition<4; edition++) {
+					if (editions & (1 << edition)) {
+						const int indicator = edition * 2 + indexHistory + 1;
+						DrawIndicator(indicator, startPos - posLineStart, posSecond - posLineStart,
+							surface, vsDraw, ll, xStart, rcLine, posSecond - posLineStart, subLine, Indicator::State::normal,
+							1, model.BidirectionalEnabled(), tabWidthMinimumPixels);
+					}
+				}
+				startPos = model.pdoc->EditionNextDelete(startPos);
 			}
 		}
 	}
@@ -1354,7 +1381,7 @@ void EditView::DrawFoldDisplayText(Surface *surface, const EditModel &model, con
 	const int widthFoldDisplayText = static_cast<int>(surface->WidthText(fontText, foldDisplayText));
 
 	InSelection eolInSelection = InSelection::inNone;
-	if (!hideSelection) {
+	if (vsDraw.selection.visible) {
 		eolInSelection = model.LineEndInSelection(line);
 	}
 
@@ -1364,7 +1391,7 @@ void EditView::DrawFoldDisplayText(Surface *surface, const EditModel &model, con
 	rcSegment.left = xStart + static_cast<XYPOSITION>(ll->positions[ll->numCharsInLine] - subLineStart) + virtualSpace + vsDraw.aveCharWidth;
 	rcSegment.right = rcSegment.left + static_cast<XYPOSITION>(widthFoldDisplayText);
 
-	const std::optional<ColourRGBA> background = vsDraw.Background(model.pdoc->GetMark(line), model.caret.active, ll->containsCaret);
+	const std::optional<ColourRGBA> background = vsDraw.Background(model.GetMark(line), model.caret.active, ll->containsCaret);
 	const std::optional<ColourRGBA> selectionFore = SelectionForeground(model, vsDraw, eolInSelection);
 	const ColourRGBA textFore = selectionFore.value_or(vsDraw.styles[StyleFoldDisplayText].fore);
 	const ColourRGBA textBack = TextBackground(model, vsDraw, ll, background, eolInSelection,
@@ -1491,7 +1518,7 @@ void EditView::DrawEOLAnnotationText(Surface *surface, const EditModel &model, c
 	}
 	rcSegment.right = rcSegment.left + static_cast<XYPOSITION>(widthEOLAnnotationText);
 
-	const std::optional<ColourRGBA> background = vsDraw.Background(model.pdoc->GetMark(line), model.caret.active, ll->containsCaret);
+	const std::optional<ColourRGBA> background = vsDraw.Background(model.GetMark(line), model.caret.active, ll->containsCaret);
 	const ColourRGBA textFore = vsDraw.styles[style].fore;
 	const ColourRGBA textBack = TextBackground(model, vsDraw, ll, background, InSelection::inNone,
 											false, static_cast<int>(style), -1);
@@ -1684,7 +1711,7 @@ void EditView::DrawCarets(Surface *surface, const EditModel &model, const ViewSt
 	Sci::Line lineDoc, int xStart, PRectangle rcLine, int subLine) const {
 	// When drag is active it is the only caret drawn
 	const bool drawDrag = model.posDrag.IsValid();
-	if (hideSelection && !drawDrag)
+	if (!vsDraw.selection.visible && !drawDrag)
 		return;
 	const Sci::Position posLineStart = model.pdoc->LineStart(lineDoc);
 	// For each selection draw
@@ -1787,7 +1814,9 @@ void EditView::DrawCarets(Surface *surface, const EditModel &model, const ViewSt
 	}
 }
 
-static void DrawWrapIndentAndMarker(Surface *surface, const ViewStyle &vsDraw, const LineLayout *ll,
+namespace {
+
+void DrawWrapIndentAndMarker(Surface *surface, const ViewStyle &vsDraw, const LineLayout *ll,
 	int xStart, PRectangle rcLine, std::optional<ColourRGBA> background, DrawWrapMarkerFn customDrawWrapMarker,
 	bool caretActive) {
 	// default bgnd here..
@@ -1827,7 +1856,7 @@ static void DrawWrapIndentAndMarker(Surface *surface, const ViewStyle &vsDraw, c
 // such that, if the caret is inside the main selection, the beginning or end of that selection
 // is at the end of a text segment.
 // This function should only be called if iDoc is within the main selection.
-static InSelection CharacterInCursesSelection(Sci::Position iDoc, const EditModel &model, const ViewStyle &vsDraw) {
+InSelection CharacterInCursesSelection(Sci::Position iDoc, const EditModel &model, const ViewStyle &vsDraw) noexcept {
 	const SelectionPosition &posCaret = model.sel.RangeMain().caret;
 	const bool caretAtStart = posCaret < model.sel.RangeMain().anchor && posCaret.Position() == iDoc;
 	const bool caretAtEnd = posCaret > model.sel.RangeMain().anchor &&
@@ -1836,6 +1865,8 @@ static InSelection CharacterInCursesSelection(Sci::Position iDoc, const EditMode
 	return (caretAtStart || caretAtEnd) ? InSelection::inNone : InSelection::inMain;
 }
 
+}
+
 void EditView::DrawBackground(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
 	PRectangle rcLine, Range lineRange, Sci::Position posLineStart, int xStart,
 	int subLine, std::optional<ColourRGBA> background) const {
@@ -1870,7 +1901,7 @@ void EditView::DrawBackground(Surface *surface, const EditModel &model, const Vi
 			if (rcSegment.right > rcLine.right)
 				rcSegment.right = rcLine.right;
 
-			InSelection inSelection = hideSelection ? InSelection::inNone : model.sel.CharacterInSelection(iDoc);
+			InSelection inSelection = vsDraw.selection.visible ? model.sel.CharacterInSelection(iDoc) : InSelection::inNone;
 			if (FlagSet(vsDraw.caret.style, CaretStyle::Curses) && (inSelection == InSelection::inMain))
 				inSelection = CharacterInCursesSelection(iDoc, model, vsDraw);
 			const bool inHotspot = model.hotspot.Valid() && model.hotspot.ContainsCharacter(iDoc);
@@ -1942,7 +1973,7 @@ static void DrawEdgeLine(Surface *surface, const ViewStyle &vsDraw, const LineLa
 // Draw underline mark as part of background if on base layer
 static void DrawMarkUnderline(Surface *surface, const EditModel &model, const ViewStyle &vsDraw,
 	Sci::Line line, PRectangle rcLine) {
-	int marks = model.pdoc->GetMark(line);
+	int marks = model.GetMark(line);
 	for (int markBit = 0; (markBit < 32) && marks; markBit++) {
 		if ((marks & 1) && (vsDraw.markers[markBit].markType == MarkerSymbol::Underline) &&
 			(vsDraw.markers[markBit].layer == Layer::Base)) {
@@ -2029,7 +2060,7 @@ static void DrawTranslucentLineState(Surface *surface, const EditModel &model, c
 			surface->FillRectangleAligned(rcLine, *vsDraw.ElementColour(Element::CaretLineBack));
 		}
 	}
-	const int marksOfLine = model.pdoc->GetMark(line);
+	const int marksOfLine = model.GetMark(line);
 	int marksDrawnInText = marksOfLine & vsDraw.maskDrawInText;
 	for (int markBit = 0; (markBit < 32) && marksDrawnInText; markBit++) {
 		if ((marksDrawnInText & 1) && (vsDraw.markers[markBit].layer == layer)) {
@@ -2105,11 +2136,11 @@ void EditView::DrawForeground(Surface *surface, const EditModel &model, const Vi
 							hover =	rangeRun.ContainsCharacter(model.hoverIndicatorPos);
 						}
 						if (hover) {
-							if (indicator.sacHover.style == IndicatorStyle::TextFore || (indicator.sacHover.style == IndicatorStyle::ExplorerLink)) {
+							if (indicator.sacHover.style == IndicatorStyle::TextFore) {
 								textFore = indicator.sacHover.fore;
 							}
 						} else {
-							if (indicator.sacNormal.style == IndicatorStyle::TextFore || (indicator.sacNormal.style == IndicatorStyle::ExplorerLink)) {
+							if (indicator.sacNormal.style == IndicatorStyle::TextFore) {
 								if (FlagSet(indicator.Flags(), IndicFlag::ValueFore))
 									textFore = ColourRGBA::FromRGB(indicatorValue & static_cast<int>(IndicValue::Mask));
 								else
@@ -2119,7 +2150,7 @@ void EditView::DrawForeground(Surface *surface, const EditModel &model, const Vi
 					}
 				}
 			}
-			InSelection inSelection = hideSelection ? InSelection::inNone : model.sel.CharacterInSelection(iDoc);
+			InSelection inSelection = vsDraw.selection.visible ? model.sel.CharacterInSelection(iDoc) : InSelection::inNone;
 			if (FlagSet(vsDraw.caret.style, CaretStyle::Curses) && (inSelection == InSelection::inMain))
 				inSelection = CharacterInCursesSelection(iDoc, model, vsDraw);
 			const std::optional<ColourRGBA> selectionFore = SelectionForeground(model, vsDraw, inSelection);
@@ -2319,7 +2350,7 @@ void EditView::DrawLine(Surface *surface, const EditModel &model, const ViewStyl
 	}
 
 	// See if something overrides the line background colour.
-	const std::optional<ColourRGBA> background = vsDraw.Background(model.pdoc->GetMark(line), model.caret.active, ll->containsCaret);
+	const std::optional<ColourRGBA> background = vsDraw.Background(model.GetMark(line), model.caret.active, ll->containsCaret);
 
 	const Sci::Position posLineStart = model.pdoc->LineStart(line);
 
@@ -2357,7 +2388,7 @@ void EditView::DrawLine(Surface *surface, const EditModel &model, const ViewStyl
 	}
 
 	if (FlagSet(phase, DrawPhase::text)) {
-		if (!hideSelection) {
+		if (vsDraw.selection.visible) {
 			DrawTranslucentSelection(surface, model, vsDraw, ll, line, rcLine, subLine, lineRange, xStart, tabWidthMinimumPixels, Layer::UnderText);
 		}
 		DrawTranslucentLineState(surface, model, vsDraw, ll, line, rcLine, subLine, Layer::UnderText);
@@ -2386,7 +2417,7 @@ void EditView::DrawLine(Surface *surface, const EditModel &model, const ViewStyl
 		DrawMarkUnderline(surface, model, vsDraw, line, rcLine);
 	}
 
-	if (!hideSelection && FlagSet(phase, DrawPhase::selectionTranslucent)) {
+	if (vsDraw.selection.visible && FlagSet(phase, DrawPhase::selectionTranslucent)) {
 		DrawTranslucentSelection(surface, model, vsDraw, ll, line, rcLine, subLine, lineRange, xStart, tabWidthMinimumPixels, Layer::OverText);
 	}
 
@@ -2523,7 +2554,7 @@ void EditView::PaintText(Surface *surfaceWindow, const EditModel &model, PRectan
 				durLayout += ep.Duration(true);
 #endif
 				if (ll) {
-					ll->containsCaret = !hideSelection && (lineDoc == lineCaret)
+					ll->containsCaret = vsDraw.selection.visible && (lineDoc == lineCaret)
 						&& (ll->lines == 1 || !vsDraw.caretLine.subLine || ll->InLine(caretOffset, subLine));
 
 					PRectangle rcLine = rcTextArea;
@@ -2633,11 +2664,11 @@ void EditView::PaintText(Surface *surfaceWindow, const EditModel &model, PRectan
 void EditView::FillLineRemainder(Surface *surface, const EditModel &model, const ViewStyle &vsDraw, const LineLayout *ll,
 	Sci::Line line, PRectangle rcArea, int subLine) const {
 		InSelection eolInSelection = InSelection::inNone;
-	if ((!hideSelection) && (subLine == (ll->lines - 1))) {
+	if (vsDraw.selection.visible && (subLine == (ll->lines - 1))) {
 		eolInSelection = model.LineEndInSelection(line);
 	}
 
-	const std::optional<ColourRGBA> background = vsDraw.Background(model.pdoc->GetMark(line), model.caret.active, ll->containsCaret);
+	const std::optional<ColourRGBA> background = vsDraw.Background(model.GetMark(line), model.caret.active, ll->containsCaret);
 
 	if (eolInSelection && vsDraw.selection.eolFilled && (line < model.pdoc->LinesTotal() - 1) && (vsDraw.selection.layer == Layer::Base)) {
 		surface->FillRectangleAligned(rcArea, Fill(SelectionBackground(model, vsDraw, eolInSelection).Opaque()));
@@ -2696,14 +2727,9 @@ Sci::Position EditView::FormatRange(bool draw, CharacterRangeFull chrg, Rectangl
 	// If this ever gets changed, cached pixmap would need to be recreated if technology != Technology::Default
 	vsPrint.viewIndentationGuides = IndentView::None;
 	// Don't show the selection when printing
+	vsPrint.selection.visible = false;
 	vsPrint.elementColours.clear();
 	vsPrint.elementBaseColours.clear();
-	// Set all selection background colours to be transparent.
-	constexpr ColourRGBA transparent(0xc0, 0xc0, 0xc0, 0x0);
-	vsPrint.elementBaseColours[Element::SelectionBack] = transparent;
-	vsPrint.elementBaseColours[Element::SelectionAdditionalBack] = transparent;
-	vsPrint.elementBaseColours[Element::SelectionSecondaryBack] = transparent;
-	vsPrint.elementBaseColours[Element::SelectionInactiveBack] = transparent;
 	vsPrint.caretLine.alwaysShow = false;
 	// Don't highlight matching braces using indicators
 	vsPrint.braceHighlightIndicatorSet = false;
diff --git a/scintilla/src/EditView.h b/scintilla/src/EditView.h
index d65bf0736..832da9f15 100644
--- a/scintilla/src/EditView.h
+++ b/scintilla/src/EditView.h
@@ -56,7 +56,6 @@ public:
 	std::unique_ptr<LineTabstops> ldTabstops;
 	int tabWidthMinimumPixels;
 
-	bool hideSelection;
 	bool drawOverstrikeCaret; // used by the curses platform
 
 	/** In bufferedDraw mode, graphics operations are drawn to a pixmap and then copied to
diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx
index a11be1472..e1e2d3c4a 100644
--- a/scintilla/src/Editor.cxx
+++ b/scintilla/src/Editor.cxx
@@ -263,7 +263,7 @@ void Editor::DropGraphics() noexcept {
 	view.DropGraphics();
 }
 
-void Editor::InvalidateStyleData() {
+void Editor::InvalidateStyleData() noexcept {
 	stylesValid = false;
 	vs.technology = technology;
 	DropGraphics();
@@ -289,13 +289,17 @@ void Editor::RefreshStyleData() {
 	}
 }
 
+bool Editor::HasMarginWindow() const noexcept {
+	return wMargin.Created();
+}
+
 Point Editor::GetVisibleOriginInMain() const {
 	return Point(0, 0);
 }
 
 PointDocument Editor::DocumentPointFromView(Point ptView) const {
 	PointDocument ptDocument(ptView);
-	if (wMargin.GetID()) {
+	if (HasMarginWindow()) {
 		const Point ptOrigin = GetVisibleOriginInMain();
 		ptDocument.x += ptOrigin.x;
 		ptDocument.y += ptOrigin.y;
@@ -306,8 +310,8 @@ PointDocument Editor::DocumentPointFromView(Point ptView) const {
 	return ptDocument;
 }
 
-Sci::Line Editor::TopLineOfMain() const {
-	if (wMargin.GetID())
+Sci::Line Editor::TopLineOfMain() const noexcept {
+	if (HasMarginWindow())
 		return 0;
 	else
 		return topLine;
@@ -432,7 +436,7 @@ Sci::Position Editor::PositionFromLineX(Sci::Line lineDoc, int x) {
 	return SPositionFromLineX(lineDoc, x).Position();
 }
 
-Sci::Line Editor::LineFromLocation(Point pt) const {
+Sci::Line Editor::LineFromLocation(Point pt) const noexcept {
 	return pcs->DocFromDisplay(static_cast<int>(pt.y) / vs.lineHeight + topLine);
 }
 
@@ -485,7 +489,7 @@ void Editor::Redraw() {
 	//Platform::DebugPrintf("Redraw all\n");
 	const PRectangle rcClient = GetClientRectangle();
 	wMain.InvalidateRectangle(rcClient);
-	if (wMargin.GetID()) {
+	if (HasMarginWindow()) {
 		wMargin.InvalidateAll();
 	} else if (paintState == PaintState::notPainting) {
 		redrawPendingText = true;
@@ -494,12 +498,12 @@ void Editor::Redraw() {
 
 void Editor::RedrawSelMargin(Sci::Line line, bool allAfter) {
 	const bool markersInText = vs.maskInLine || vs.maskDrawInText;
-	if (!wMargin.GetID() || markersInText) {	// May affect text area so may need to abandon and retry
+	if (!HasMarginWindow() || markersInText) {	// May affect text area so may need to abandon and retry
 		if (AbandonPaint()) {
 			return;
 		}
 	}
-	if (wMargin.GetID() && markersInText) {
+	if (HasMarginWindow() && markersInText) {
 		Redraw();
 		return;
 	}
@@ -532,7 +536,7 @@ void Editor::RedrawSelMargin(Sci::Line line, bool allAfter) {
 		if (rcMarkers.Empty())
 			return;
 	}
-	if (wMargin.GetID()) {
+	if (HasMarginWindow()) {
 		const Point ptOrigin = GetVisibleOriginInMain();
 		rcMarkers.Move(-ptOrigin.x, -ptOrigin.y);
 		wMargin.InvalidateRectangle(rcMarkers);
@@ -570,7 +574,7 @@ void Editor::InvalidateRange(Sci::Position start, Sci::Position end) {
 	RedrawRect(RectangleFromRange(Range(start, end), view.LinesOverlap() ? vs.lineOverlap : 0));
 }
 
-Sci::Position Editor::CurrentPosition() const {
+Sci::Position Editor::CurrentPosition() const noexcept {
 	return sel.MainCaret();
 }
 
@@ -578,11 +582,11 @@ bool Editor::SelectionEmpty() const noexcept {
 	return sel.Empty();
 }
 
-SelectionPosition Editor::SelectionStart() {
+SelectionPosition Editor::SelectionStart() noexcept {
 	return sel.RangeMain().Start();
 }
 
-SelectionPosition Editor::SelectionEnd() {
+SelectionPosition Editor::SelectionEnd() noexcept {
 	return sel.RangeMain().End();
 }
 
@@ -809,7 +813,7 @@ bool Editor::RangeContainsProtected(Sci::Position start, Sci::Position end) cons
 	return false;
 }
 
-bool Editor::SelectionContainsProtected() const {
+bool Editor::SelectionContainsProtected() const noexcept {
 	for (size_t r=0; r<sel.Count(); r++) {
 		if (RangeContainsProtected(sel.Range(r).Start().Position(),
 			sel.Range(r).End().Position())) {
@@ -1937,9 +1941,7 @@ SelectionPosition Editor::RealizeVirtualSpace(const SelectionPosition &position)
 }
 
 void Editor::AddChar(char ch) {
-	char s[2];
-	s[0] = ch;
-	s[1] = '\0';
+	const char s[1] {ch};
 	InsertCharacter(std::string_view(s, 1), CharacterSource::DirectInput);
 }
 
@@ -2356,15 +2358,6 @@ void Editor::DelCharBack(bool allowLineStartDeletion) {
 	ShowCaretAtCurrentPosition();
 }
 
-KeyMod Editor::ModifierFlags(bool shift, bool ctrl, bool alt, bool meta, bool super) noexcept {
-	return
-		(shift ? KeyMod::Shift : KeyMod::Norm) |
-		(ctrl ? KeyMod::Ctrl : KeyMod::Norm) |
-		(alt ? KeyMod::Alt : KeyMod::Norm) |
-		(meta ? KeyMod::Meta : KeyMod::Norm) |
-		(super ? KeyMod::Super : KeyMod::Norm);
-}
-
 void Editor::NotifyFocus(bool focus) {
 	NotificationData scn = {};
 	scn.nmhdr.code = focus ? Notification::FocusIn : Notification::FocusOut;
@@ -2405,6 +2398,9 @@ void Editor::NotifySavePoint(bool isSavePoint) {
 	NotificationData scn = {};
 	if (isSavePoint) {
 		scn.nmhdr.code = Notification::SavePointReached;
+		if (changeHistoryOption != ChangeHistoryOption::Disabled) {
+			Redraw();
+		}
 	} else {
 		scn.nmhdr.code = Notification::SavePointLeft;
 	}
@@ -2733,6 +2729,9 @@ void Editor::NotifyModified(Document *, DocModification mh, void *) {
 					QueueIdleWork(WorkItems::style, mh.position + mh.length);
 				}
 				InvalidateRange(mh.position, mh.position + mh.length);
+				if (FlagSet(changeHistoryOption, ChangeHistoryOption::Markers)) {
+					RedrawSelMargin(pdoc->SciLineFromPosition(mh.position));
+				}
 			}
 		}
 	}
@@ -4174,7 +4173,7 @@ Sci::Position Editor::FindTextFull(
  * while still setting the selection to found text so the find/select
  * operation is self-contained.
  */
-void Editor::SearchAnchor() {
+void Editor::SearchAnchor() noexcept {
 	searchAnchor = SelectionStart().Position();
 }
 
@@ -4780,7 +4779,7 @@ void Editor::RightButtonDownWithModifiers(Point pt, unsigned int, KeyMod modifie
 		return;
 }
 
-bool Editor::PositionIsHotspot(Sci::Position position) const {
+bool Editor::PositionIsHotspot(Sci::Position position) const noexcept {
 	return vs.styles[pdoc->StyleIndexAt(position)].hotspot;
 }
 
@@ -5267,7 +5266,7 @@ bool Editor::PaintContains(PRectangle rc) {
 }
 
 bool Editor::PaintContainsMargin() {
-	if (wMargin.GetID()) {
+	if (HasMarginWindow()) {
 		// With separate margin view, paint of text view
 		// never contains margin.
 		return false;
@@ -5414,18 +5413,23 @@ void Editor::SetEOLAnnotationVisible(EOLAnnotationVisible visible) {
 Sci::Line Editor::ExpandLine(Sci::Line line) {
 	const Sci::Line lineMaxSubord = pdoc->GetLastChild(line);
 	line++;
+	Sci::Line lineStart = line;
 	while (line <= lineMaxSubord) {
-		pcs->SetVisible(line, line, true);
 		const FoldLevel level = pdoc->GetFoldLevel(line);
 		if (LevelIsHeader(level)) {
+			pcs->SetVisible(lineStart, line, true);
 			if (pcs->GetExpanded(line)) {
 				line = ExpandLine(line);
 			} else {
 				line = pdoc->GetLastChild(line);
 			}
+			lineStart = line + 1;
 		}
 		line++;
 	}
+	if (lineStart <= lineMaxSubord) {
+		pcs->SetVisible(lineStart, lineMaxSubord, true);
+	}
 	return lineMaxSubord;
 }
 
@@ -5573,35 +5577,40 @@ void Editor::EnsureLineVisible(Sci::Line lineDoc, bool enforcePolicy) {
 
 void Editor::FoldAll(FoldAction action) {
 	const Sci::Line maxLine = pdoc->LinesTotal();
+	const bool contractAll = FlagSet(action, FoldAction::ContractEveryLevel);
+	action = static_cast<FoldAction>(static_cast<int>(action) & ~static_cast<int>(FoldAction::ContractEveryLevel));
 	bool expanding = action == FoldAction::Expand;
 	if (!expanding) {
 		pdoc->EnsureStyledTo(pdoc->Length());
 	}
+	Sci::Line line = 0;
 	if (action == FoldAction::Toggle) {
 		// Discover current state
-		for (Sci::Line lineSeek = 0; lineSeek < maxLine; lineSeek++) {
-			if (LevelIsHeader(pdoc->GetFoldLevel(lineSeek))) {
-				expanding = !pcs->GetExpanded(lineSeek);
+		for (; line < maxLine; line++) {
+			if (LevelIsHeader(pdoc->GetFoldLevel(line))) {
+				expanding = !pcs->GetExpanded(line);
 				break;
 			}
 		}
 	}
 	if (expanding) {
 		pcs->SetVisible(0, maxLine-1, true);
-		for (Sci::Line line = 0; line < maxLine; line++) {
-			if (!pcs->GetExpanded(line)) {
-				SetFoldExpanded(line, true);
-			}
-		}
+		pcs->ExpandAll();
 	} else {
-		for (Sci::Line line = 0; line < maxLine; line++) {
+		for (; line < maxLine; line++) {
 			const FoldLevel level = pdoc->GetFoldLevel(line);
-			if (LevelIsHeader(level) &&
-					(FoldLevel::Base == LevelNumberPart(level))) {
-				SetFoldExpanded(line, false);
-				const Sci::Line lineMaxSubord = pdoc->GetLastChild(line);
-				if (lineMaxSubord > line) {
-					pcs->SetVisible(line + 1, lineMaxSubord, false);
+			if (LevelIsHeader(level)) {
+				if (FoldLevel::Base == LevelNumberPart(level)) {
+					SetFoldExpanded(line, false);
+					const Sci::Line lineMaxSubord = pdoc->GetLastChild(line);
+					if (lineMaxSubord > line) {
+						pcs->SetVisible(line + 1, lineMaxSubord, false);
+						if (!contractAll) {
+							line = lineMaxSubord;
+						}
+					}
+				} else if (contractAll) {
+					SetFoldExpanded(line, false);
 				}
 			}
 		}
@@ -6322,10 +6331,14 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
 		}
 
 	case Message::HideSelection:
-		view.hideSelection = wParam != 0;
+		vs.selection.visible = wParam == 0;
 		Redraw();
 		break;
 
+	case Message::GetSelectionHidden:
+		return !vs.selection.visible;
+		break;
+
 	case Message::FormatRange:
 	case Message::FormatRangeFull:
 		return FormatRange(iMessage, wParam, lParam);
@@ -7166,14 +7179,14 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
 		break;
 
 	case Message::MarkerGet:
-		return pdoc->GetMark(LineFromUPtr(wParam));
+		return GetMark(LineFromUPtr(wParam));
 
 	case Message::MarkerNext:
 		return pdoc->MarkerNext(LineFromUPtr(wParam), static_cast<int>(lParam));
 
 	case Message::MarkerPrevious: {
 			for (Sci::Line iLine = LineFromUPtr(wParam); iLine >= 0; iLine--) {
-				if ((pdoc->GetMark(iLine) & lParam) != 0)
+				if ((GetMark(iLine) & lParam) != 0)
 					return iLine;
 			}
 		}
@@ -8344,6 +8357,14 @@ sptr_t Editor::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
 	case Message::GetGapPosition:
 		return pdoc->GapPosition();
 
+	case Message::SetChangeHistory:
+		changeHistoryOption = static_cast<ChangeHistoryOption>(wParam);
+		pdoc->ChangeHistorySet(wParam & 1);
+		break;
+
+	case Message::GetChangeHistory:
+		return static_cast<sptr_t>(changeHistoryOption);
+
 	case Message::SetExtraAscent:
 		vs.extraAscent = static_cast<int>(wParam);
 		InvalidateStyleRedraw();
diff --git a/scintilla/src/Editor.h b/scintilla/src/Editor.h
index 44d14ffaf..85bcc8f7b 100644
--- a/scintilla/src/Editor.h
+++ b/scintilla/src/Editor.h
@@ -296,17 +296,18 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	virtual void Initialise() = 0;
 	virtual void Finalise();
 
-	void InvalidateStyleData();
+	void InvalidateStyleData() noexcept;
 	void InvalidateStyleRedraw();
 	void RefreshStyleData();
 	void SetRepresentations();
 	void DropGraphics() noexcept;
 
+	bool HasMarginWindow() const noexcept;
 	// The top left visible point in main window coordinates. Will be 0,0 except for
 	// scroll views where it will be equivalent to the current scroll position.
 	Point GetVisibleOriginInMain() const override;
 	PointDocument DocumentPointFromView(Point ptView) const;  // Convert a point from view space to document
-	Sci::Line TopLineOfMain() const override;   // Return the line at Main's y coordinate 0
+	Sci::Line TopLineOfMain() const noexcept final;   // Return the line at Main's y coordinate 0
 	virtual PRectangle GetClientRectangle() const;
 	virtual PRectangle GetClientDrawingRectangle();
 	PRectangle GetTextRectangle() const;
@@ -322,7 +323,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	Sci::Position PositionFromLocation(Point pt, bool canReturnInvalid = false, bool charPosition = false);
 	SelectionPosition SPositionFromLineX(Sci::Line lineDoc, int x);
 	Sci::Position PositionFromLineX(Sci::Line lineDoc, int x);
-	Sci::Line LineFromLocation(Point pt) const;
+	Sci::Line LineFromLocation(Point pt) const noexcept;
 	void SetTopLine(Sci::Line topLineNew);
 
 	virtual bool AbandonPaint();
@@ -336,10 +337,10 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	bool UserVirtualSpace() const noexcept {
 		return (FlagSet(virtualSpaceOptions, Scintilla::VirtualSpace::UserAccessible));
 	}
-	Sci::Position CurrentPosition() const;
+	Sci::Position CurrentPosition() const noexcept;
 	bool SelectionEmpty() const noexcept;
-	SelectionPosition SelectionStart();
-	SelectionPosition SelectionEnd();
+	SelectionPosition SelectionStart() noexcept;
+	SelectionPosition SelectionEnd() noexcept;
 	void SetRectangularRange();
 	void ThinRectangularRange();
 	void InvalidateSelection(SelectionRange newMain, bool invalidateWholeSelection=false);
@@ -353,7 +354,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	enum class AddNumber { one, each };
 	void MultipleSelectAdd(AddNumber addNumber);
 	bool RangeContainsProtected(Sci::Position start, Sci::Position end) const noexcept;
-	bool SelectionContainsProtected() const;
+	bool SelectionContainsProtected() const noexcept;
 	Sci::Position MovePositionOutsideChar(Sci::Position pos, Sci::Position moveDir, bool checkLineEnd=true) const;
 	SelectionPosition MovePositionOutsideChar(SelectionPosition pos, Sci::Position moveDir, bool checkLineEnd=true) const;
 	void MovedCaret(SelectionPosition newPos, SelectionPosition previousPos,
@@ -442,7 +443,6 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	void DelCharBack(bool allowLineStartDeletion);
 	virtual void ClaimSelection() = 0;
 
-	static Scintilla::KeyMod ModifierFlags(bool shift, bool ctrl, bool alt, bool meta=false, bool super=false) noexcept;
 	virtual void NotifyChange() = 0;
 	virtual void NotifyFocus(bool focus);
 	virtual void SetCtrlID(int identifier);
@@ -504,7 +504,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	virtual std::unique_ptr<CaseFolder> CaseFolderForEncoding();
 	Sci::Position FindText(Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
 	Sci::Position FindTextFull(Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
-	void SearchAnchor();
+	void SearchAnchor() noexcept;
 	Sci::Position SearchText(Scintilla::Message iMessage, Scintilla::uptr_t wParam, Scintilla::sptr_t lParam);
 	Sci::Position SearchInTarget(const char *text, Sci::Position length);
 	void GoToLine(Sci::Line lineNo);
@@ -584,7 +584,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	Sci::Position GetTag(char *tagValue, int tagNumber);
 	Sci::Position ReplaceTarget(bool replacePatterns, const char *text, Sci::Position length=-1);
 
-	bool PositionIsHotspot(Sci::Position position) const;
+	bool PositionIsHotspot(Sci::Position position) const noexcept;
 	bool PointIsHotspot(Point pt);
 	void SetHotSpotRange(const Point *pt);
 	void SetHoverIndicatorPosition(Sci::Position position);
diff --git a/scintilla/src/Indicator.cxx b/scintilla/src/Indicator.cxx
index 24b08268d..04693bd71 100644
--- a/scintilla/src/Indicator.cxx
+++ b/scintilla/src/Indicator.cxx
@@ -252,7 +252,7 @@ void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &r
 
 	case IndicatorStyle::CompositionThick: {
 			const PRectangle rcComposition(rc.left+1, rcLine.bottom-2, rc.right-1, rcLine.bottom);
-			surface->FillRectangle(rcComposition, sacDraw.fore);
+			surface->FillRectangle(rcComposition, ColourRGBA(sacDraw.fore, outlineAlpha));
 		}
 		break;
 
@@ -269,7 +269,7 @@ void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &r
 			const XYPOSITION x = (sacDraw.style == IndicatorStyle::Point) ? (rcCharacter.left) : ((rcCharacter.right + rcCharacter.left) / 2);
 			// 0.5f is to hit midpoint of pixels:
 			const XYPOSITION ix = std::round(x) + 0.5f;
-			const XYPOSITION iy = std::floor(rc.top + 1.0f) + 0.5f;
+			const XYPOSITION iy = std::floor(rc.top) + 0.5f;
 			const Point pts[] = {
 				Point(ix - pixelHeight, iy + pixelHeight),	// Left
 				Point(ix + pixelHeight, iy + pixelHeight),	// Right
@@ -279,6 +279,22 @@ void Indicator::Draw(Surface *surface, const PRectangle &rc, const PRectangle &r
 		}
 		break;
 
+	case IndicatorStyle::PointTop:
+		if (rcCharacter.Width() >= 0.1) {
+			const XYPOSITION pixelHeight = std::floor(rc.Height() - 1.0f);	// 1 pixel onto previous line if multiphase
+			const XYPOSITION x = rcCharacter.left;
+			// 0.5f is to hit midpoint of pixels:
+			const XYPOSITION ix = std::round(x) + 0.5f;
+			const XYPOSITION iy = std::floor(rcLine.top) + 0.5f;
+			const Point pts[] = {
+				Point(ix - pixelHeight, iy),	// Left
+				Point(ix + pixelHeight, iy),	// Right
+				Point(ix, iy + pixelHeight)		// Bottom
+			};
+			surface->Polygon(pts, std::size(pts), FillStroke(sacDraw.fore));
+		}
+		break;
+
 	default:
 		// Either IndicatorStyle::Plain, IndicatorStyle::ExplorerLink or unknown
 		surface->FillRectangle(PRectangle(rcAligned.left, ymid,
diff --git a/scintilla/src/LineMarker.cxx b/scintilla/src/LineMarker.cxx
index 4cbade97c..5bf4d07c4 100644
--- a/scintilla/src/LineMarker.cxx
+++ b/scintilla/src/LineMarker.cxx
@@ -514,6 +514,37 @@ void LineMarker::Draw(Surface *surface, const PRectangle &rcWhole, const Font *f
 		}
 		break;
 
+	case MarkerSymbol::Bar: {
+			PRectangle rcBar = rcWhole;
+			const XYPOSITION widthBar = std::floor(rcWhole.Width() / 3.0);
+			rcBar.left = centreX - std::floor(widthBar / 2.0);
+			rcBar.right = rcBar.left + widthBar;
+			surface->SetClip(rcWhole);
+			switch (part) {
+			case LineMarker::FoldPart::headWithTail:
+				surface->RectangleDraw(rcBar, FillStroke(back, fore, strokeWidth));
+				break;
+			case LineMarker::FoldPart::head:
+				rcBar.bottom += 5;
+				surface->RectangleDraw(rcBar, FillStroke(back, fore, strokeWidth));
+				break;
+			case LineMarker::FoldPart::tail:
+				rcBar.top -= 5;
+				surface->RectangleDraw(rcBar, FillStroke(back, fore, strokeWidth));
+				break;
+			case LineMarker::FoldPart::body:
+				rcBar.top -= 5;
+				rcBar.bottom += 5;
+				surface->RectangleDraw(rcBar, FillStroke(back, fore, strokeWidth));
+				break;
+			default:
+				break;
+			}
+			surface->PopClip();
+		}
+		break;
+
+
 	case MarkerSymbol::Bookmark: {
 			const XYPOSITION halfHeight = std::floor(minDim / 3);
 			Point pts[] = {
diff --git a/scintilla/src/MarginView.cxx b/scintilla/src/MarginView.cxx
index cc243f41f..6e43c0f0c 100644
--- a/scintilla/src/MarginView.cxx
+++ b/scintilla/src/MarginView.cxx
@@ -283,7 +283,11 @@ void MarginView::PaintOneMargin(Surface *surface, PRectangle rc, PRectangle rcOn
 		const bool firstSubLine = visibleLine == firstVisibleLine;
 		const bool lastSubLine = visibleLine == lastVisibleLine;
 
-		int marks = firstSubLine ? model.pdoc->GetMark(lineDoc) : 0;
+		int marks = model.GetMark(lineDoc);
+		if (!firstSubLine) {
+			// Mask off non-continuing marks
+			marks = marks & vs.maskDrawWrapped;
+		}
 
 		bool headWithTail = false;
 
@@ -413,6 +417,24 @@ void MarginView::PaintOneMargin(Surface *surface, PRectangle rc, PRectangle rcOn
 							part = LineMarker::FoldPart::tail;
 						}
 					}
+					if (vs.markers[markBit].markType == MarkerSymbol::Bar) {
+						const int mask = 1 << markBit;
+						const bool markBefore = firstSubLine ? (model.GetMark(lineDoc-1) & mask) : true;
+						const bool markAfter = lastSubLine ? (model.GetMark(lineDoc+1) & mask) : true;
+						if (markBefore) {
+							if (markAfter) {
+								part = LineMarker::FoldPart::body;
+							} else {
+								part = LineMarker::FoldPart::tail;
+							}
+						} else {
+							if (markAfter) {
+								part = LineMarker::FoldPart::head;
+							} else {
+								part = LineMarker::FoldPart::headWithTail;
+							}
+						}
+					}
 					vs.markers[markBit].Draw(surface, rcMarker, vs.styles[StyleLineNumber].font.get(), part, marginStyle.style);
 				}
 				marks >>= 1;
diff --git a/scintilla/src/Partitioning.h b/scintilla/src/Partitioning.h
index 4b2c803d3..a79e12005 100644
--- a/scintilla/src/Partitioning.h
+++ b/scintilla/src/Partitioning.h
@@ -10,44 +10,6 @@
 
 namespace Scintilla::Internal {
 
-/// A split vector of integers with a method for adding a value to all elements
-/// in a range.
-/// Used by the Partitioning class.
-
-template <typename T>
-class SplitVectorWithRangeAdd : public SplitVector<T> {
-public:
-	explicit SplitVectorWithRangeAdd(ptrdiff_t growSize_) {
-		this->SetGrowSize(growSize_);
-		this->ReAllocate(growSize_);
-	}
-	// Deleted so SplitVectorWithRangeAdd objects can not be copied.
-	SplitVectorWithRangeAdd(const SplitVectorWithRangeAdd &) = delete;
-	SplitVectorWithRangeAdd(SplitVectorWithRangeAdd &&) = delete;
-	void operator=(const SplitVectorWithRangeAdd &) = delete;
-	void operator=(SplitVectorWithRangeAdd &&) = delete;
-	~SplitVectorWithRangeAdd() {
-	}
-	void RangeAddDelta(ptrdiff_t start, ptrdiff_t end, T delta) noexcept {
-		// end is 1 past end, so end-start is number of elements to change
-		ptrdiff_t i = 0;
-		const ptrdiff_t rangeLength = end - start;
-		ptrdiff_t range1Length = rangeLength;
-		const ptrdiff_t part1Left = this->part1Length - start;
-		if (range1Length > part1Left)
-			range1Length = part1Left;
-		while (i < range1Length) {
-			this->body[start++] += delta;
-			i++;
-		}
-		start += this->gapLength;
-		while (i < rangeLength) {
-			this->body[start++] += delta;
-			i++;
-		}
-	}
-};
-
 /// Divide an interval into multiple partitions.
 /// Useful for breaking a document down into sections such as lines.
 /// A 0 length interval has a single 0 length partition, numbered 0
@@ -62,15 +24,41 @@ private:
 	// there may be a step somewhere in the list.
 	T stepPartition;
 	T stepLength;
-	std::unique_ptr<SplitVectorWithRangeAdd<T>> body;
+	SplitVector<T> body;
+
+	// Deleted so SplitVectorWithRangeAdd objects can not be copied.
+	void RangeAddDelta(T start, T end, T delta) noexcept {
+		// end is 1 past end, so end-start is number of elements to change
+		const ptrdiff_t position = start;
+		ptrdiff_t i = 0;
+		const ptrdiff_t rangeLength = end - position;
+		ptrdiff_t range1Length = rangeLength;
+		const ptrdiff_t part1Left = body.GapPosition() - position;
+		if (range1Length > part1Left)
+			range1Length = part1Left;
+		T *writer = &body[position];
+		while (i < range1Length) {
+			*writer += delta;
+			writer++;
+			i++;
+		}
+		if (i < rangeLength) {
+			T *writer2 = &body[position + i];
+			while (i < rangeLength) {
+				*writer2 += delta;
+				writer2++;
+				i++;
+			}
+		}
+	}
 
 	// Move step forward
 	void ApplyStep(T partitionUpTo) noexcept {
 		if (stepLength != 0) {
-			body->RangeAddDelta(stepPartition+1, partitionUpTo + 1, stepLength);
+			RangeAddDelta(stepPartition+1, partitionUpTo + 1, stepLength);
 		}
 		stepPartition = partitionUpTo;
-		if (stepPartition >= body->Length()-1) {
+		if (stepPartition >= Partitions()) {
 			stepPartition = Partitions();
 			stepLength = 0;
 		}
@@ -79,40 +67,24 @@ private:
 	// Move step backward
 	void BackStep(T partitionDownTo) noexcept {
 		if (stepLength != 0) {
-			body->RangeAddDelta(partitionDownTo+1, stepPartition+1, -stepLength);
+			RangeAddDelta(partitionDownTo+1, stepPartition+1, -stepLength);
 		}
 		stepPartition = partitionDownTo;
 	}
 
-	void Allocate(ptrdiff_t growSize) {
-		body = std::make_unique<SplitVectorWithRangeAdd<T>>(growSize);
-		stepPartition = 0;
-		stepLength = 0;
-		body->Insert(0, 0);	// This value stays 0 for ever
-		body->Insert(1, 0);	// This is the end of the first partition and will be the start of the second
-	}
-
 public:
-	explicit Partitioning(int growSize) : stepPartition(0), stepLength(0) {
-		Allocate(growSize);
-	}
-
-	// Deleted so Partitioning objects can not be copied.
-	Partitioning(const Partitioning &) = delete;
-	Partitioning(Partitioning &&) = delete;
-	void operator=(const Partitioning &) = delete;
-	void operator=(Partitioning &&) = delete;
-
-	~Partitioning() {
+	explicit Partitioning(size_t growSize=8) : stepPartition(0), stepLength(0), body(growSize) {
+		body.Insert(0, 0);	// This value stays 0 for ever
+		body.Insert(1, 0);	// This is the end of the first partition and will be the start of the second
 	}
 
 	T Partitions() const noexcept {
-		return static_cast<T>(body->Length())-1;
+		return static_cast<T>(body.Length())-1;
 	}
 
 	void ReAllocate(ptrdiff_t newSize) {
 		// + 1 accounts for initial element that is always 0.
-		body->ReAllocate(newSize + 1);
+		body.ReAllocate(newSize + 1);
 	}
 
 	T Length() const noexcept {
@@ -123,7 +95,7 @@ public:
 		if (stepPartition < partition) {
 			ApplyStep(partition);
 		}
-		body->Insert(partition, pos);
+		body.Insert(partition, pos);
 		stepPartition++;
 	}
 
@@ -131,7 +103,7 @@ public:
 		if (stepPartition < partition) {
 			ApplyStep(partition);
 		}
-		body->InsertFromArray(partition, positions, 0, length);
+		body.InsertFromArray(partition, positions, 0, length);
 		stepPartition += static_cast<T>(length);
 	}
 
@@ -140,7 +112,7 @@ public:
 		if (stepPartition < partition) {
 			ApplyStep(partition);
 		}
-		T *pInsertion = body->InsertEmpty(partition, length);
+		T *pInsertion = body.InsertEmpty(partition, length);
 		for (size_t i = 0; i < length; i++) {
 			pInsertion[i] = static_cast<T>(positions[i]);
 		}
@@ -149,10 +121,10 @@ public:
 
 	void SetPartitionStartPosition(T partition, T pos) noexcept {
 		ApplyStep(partition+1);
-		if ((partition < 0) || (partition > body->Length())) {
+		if ((partition < 0) || (partition >= body.Length())) {
 			return;
 		}
-		body->SetValueAt(partition, pos);
+		body.SetValueAt(partition, pos);
 	}
 
 	void InsertText(T partitionInsert, T delta) noexcept {
@@ -162,7 +134,7 @@ public:
 				// Fill in up to the new insertion point
 				ApplyStep(partitionInsert);
 				stepLength += delta;
-			} else if (partitionInsert >= (stepPartition - body->Length() / 10)) {
+			} else if (partitionInsert >= (stepPartition - body.Length() / 10)) {
 				// Close to step but before so move step back
 				BackStep(partitionInsert);
 				stepLength += delta;
@@ -184,17 +156,17 @@ public:
 		} else {
 			stepPartition--;
 		}
-		body->Delete(partition);
+		body.Delete(partition);
 	}
 
 	T PositionFromPartition(T partition) const noexcept {
 		PLATFORM_ASSERT(partition >= 0);
-		PLATFORM_ASSERT(partition < body->Length());
-		const ptrdiff_t lengthBody = body->Length();
+		PLATFORM_ASSERT(partition < body.Length());
+		const ptrdiff_t lengthBody = body.Length();
 		if ((partition < 0) || (partition >= lengthBody)) {
 			return 0;
 		}
-		T pos = body->ValueAt(partition);
+		T pos = body.ValueAt(partition);
 		if (partition > stepPartition)
 			pos += stepLength;
 		return pos;
@@ -202,7 +174,7 @@ public:
 
 	/// Return value in range [0 .. Partitions() - 1] even for arguments outside interval
 	T PartitionFromPosition(T pos) const noexcept {
-		if (body->Length() <= 1)
+		if (body.Length() <= 1)
 			return 0;
 		if (pos >= (PositionFromPartition(Partitions())))
 			return Partitions() - 1;
@@ -210,7 +182,7 @@ public:
 		T upper = Partitions();
 		do {
 			const T middle = (upper + lower + 1) / 2; 	// Round high
-			T posMiddle = body->ValueAt(middle);
+			T posMiddle = body.ValueAt(middle);
 			if (middle > stepPartition)
 				posMiddle += stepLength;
 			if (pos < posMiddle) {
@@ -223,7 +195,11 @@ public:
 	}
 
 	void DeleteAll() {
-		Allocate(body->GetGrowSize());
+		body.DeleteAll();
+		stepPartition = 0;
+		stepLength = 0;
+		body.Insert(0, 0);	// This value stays 0 for ever
+		body.Insert(1, 0);	// This is the end of the first partition and will be the start of the second
 	}
 
 	void Check() const {
diff --git a/scintilla/src/PerLine.cxx b/scintilla/src/PerLine.cxx
index a685234b9..bab6f1487 100644
--- a/scintilla/src/PerLine.cxx
+++ b/scintilla/src/PerLine.cxx
@@ -34,10 +34,6 @@ using namespace Scintilla::Internal;
 MarkerHandleSet::MarkerHandleSet() {
 }
 
-MarkerHandleSet::~MarkerHandleSet() {
-	mhList.clear();
-}
-
 bool MarkerHandleSet::Empty() const noexcept {
 	return mhList.empty();
 }
@@ -93,9 +89,6 @@ void MarkerHandleSet::CombineWith(MarkerHandleSet *other) noexcept {
 	mhList.splice_after(mhList.before_begin(), other->mhList);
 }
 
-LineMarkers::~LineMarkers() {
-}
-
 void LineMarkers::Init() {
 	markers.DeleteAll();
 }
@@ -219,9 +212,6 @@ void LineMarkers::DeleteMarkFromHandle(int markerHandle) {
 	}
 }
 
-LineLevels::~LineLevels() {
-}
-
 void LineLevels::Init() {
 	levels.DeleteAll();
 }
@@ -262,15 +252,13 @@ void LineLevels::ClearLevels() {
 }
 
 int LineLevels::SetLevel(Sci::Line line, int level, Sci::Line lines) {
-	int prev = 0;
+	int prev = level;
 	if ((line >= 0) && (line < lines)) {
 		if (!levels.Length()) {
 			ExpandLevels(lines + 1);
 		}
 		prev = levels[line];
-		if (prev != level) {
-			levels[line] = level;
-		}
+		levels[line] = level;
 	}
 	return prev;
 }
@@ -283,9 +271,6 @@ int LineLevels::GetLevel(Sci::Line line) const noexcept {
 	}
 }
 
-LineState::~LineState() {
-}
-
 void LineState::Init() {
 	lineStates.DeleteAll();
 }
@@ -312,10 +297,13 @@ void LineState::RemoveLine(Sci::Line line) {
 	}
 }
 
-int LineState::SetLineState(Sci::Line line, int state) {
-	lineStates.EnsureLength(line + 1);
-	const int stateOld = lineStates[line];
-	lineStates[line] = state;
+int LineState::SetLineState(Sci::Line line, int state, Sci::Line lines) {
+	int stateOld = state;
+	if ((line >= 0) && (line < lines)) {
+		lineStates.EnsureLength(lines + 1);
+		stateOld = lineStates[line];
+		lineStates[line] = state;
+	}
 	return stateOld;
 }
 
@@ -354,9 +342,6 @@ std::unique_ptr<char[]>AllocateAnnotation(size_t length, int style) {
 
 }
 
-LineAnnotation::~LineAnnotation() {
-}
-
 bool LineAnnotation::Empty() const noexcept {
 	return annotations.Length() == 0;
 }
@@ -481,9 +466,6 @@ int LineAnnotation::Lines(Sci::Line line) const noexcept {
 		return 0;
 }
 
-LineTabstops::~LineTabstops() {
-}
-
 void LineTabstops::Init() {
 	tabstops.DeleteAll();
 }
diff --git a/scintilla/src/PerLine.h b/scintilla/src/PerLine.h
index a0e807306..04631023c 100644
--- a/scintilla/src/PerLine.h
+++ b/scintilla/src/PerLine.h
@@ -28,12 +28,6 @@ class MarkerHandleSet {
 
 public:
 	MarkerHandleSet();
-	// Deleted so MarkerHandleSet objects can not be copied.
-	MarkerHandleSet(const MarkerHandleSet &) = delete;
-	MarkerHandleSet(MarkerHandleSet &&) = delete;
-	void operator=(const MarkerHandleSet &) = delete;
-	void operator=(MarkerHandleSet &&) = delete;
-	~MarkerHandleSet();
 	bool Empty() const noexcept;
 	int MarkValue() const noexcept;	///< Bit set of marker numbers.
 	bool Contains(int handle) const noexcept;
@@ -51,12 +45,6 @@ class LineMarkers : public PerLine {
 public:
 	LineMarkers() : handleCurrent(0) {
 	}
-	// Deleted so LineMarkers objects can not be copied.
-	LineMarkers(const LineMarkers &) = delete;
-	LineMarkers(LineMarkers &&) = delete;
-	void operator=(const LineMarkers &) = delete;
-	void operator=(LineMarkers &&) = delete;
-	~LineMarkers() override;
 	void Init() override;
 	void InsertLine(Sci::Line line) override;
 	void InsertLines(Sci::Line line, Sci::Line lines) override;
@@ -78,12 +66,6 @@ class LineLevels : public PerLine {
 public:
 	LineLevels() {
 	}
-	// Deleted so LineLevels objects can not be copied.
-	LineLevels(const LineLevels &) = delete;
-	LineLevels(LineLevels &&) = delete;
-	void operator=(const LineLevels &) = delete;
-	void operator=(LineLevels &&) = delete;
-	~LineLevels() override;
 	void Init() override;
 	void InsertLine(Sci::Line line) override;
 	void InsertLines(Sci::Line line, Sci::Line lines) override;
@@ -100,18 +82,12 @@ class LineState : public PerLine {
 public:
 	LineState() {
 	}
-	// Deleted so LineState objects can not be copied.
-	LineState(const LineState &) = delete;
-	LineState(LineState &&) = delete;
-	void operator=(const LineState &) = delete;
-	void operator=(LineState &&) = delete;
-	~LineState() override;
 	void Init() override;
 	void InsertLine(Sci::Line line) override;
 	void InsertLines(Sci::Line line, Sci::Line lines) override;
 	void RemoveLine(Sci::Line line) override;
 
-	int SetLineState(Sci::Line line, int state);
+	int SetLineState(Sci::Line line, int state, Sci::Line lines);
 	int GetLineState(Sci::Line line);
 	Sci::Line GetMaxLineState() const noexcept;
 };
@@ -121,12 +97,6 @@ class LineAnnotation : public PerLine {
 public:
 	LineAnnotation() {
 	}
-	// Deleted so LineAnnotation objects can not be copied.
-	LineAnnotation(const LineAnnotation &) = delete;
-	LineAnnotation(LineAnnotation &&) = delete;
-	void operator=(const LineAnnotation &) = delete;
-	void operator=(LineAnnotation &&) = delete;
-	~LineAnnotation() override;
 
 	[[nodiscard]] bool Empty() const noexcept;
 	void Init() override;
@@ -153,12 +123,6 @@ class LineTabstops : public PerLine {
 public:
 	LineTabstops() {
 	}
-	// Deleted so LineTabstops objects can not be copied.
-	LineTabstops(const LineTabstops &) = delete;
-	LineTabstops(LineTabstops &&) = delete;
-	void operator=(const LineTabstops &) = delete;
-	void operator=(LineTabstops &&) = delete;
-	~LineTabstops() override;
 	void Init() override;
 	void InsertLine(Sci::Line line) override;
 	void InsertLines(Sci::Line line, Sci::Line lines) override;
diff --git a/scintilla/src/Platform.h b/scintilla/src/Platform.h
index ce04d9b22..b0d12888d 100644
--- a/scintilla/src/Platform.h
+++ b/scintilla/src/Platform.h
@@ -319,7 +319,7 @@ struct ListOptions {
 class ListBox : public Window {
 public:
 	ListBox() noexcept;
-	virtual ~ListBox() noexcept override;
+	~ListBox() noexcept override;
 	static std::unique_ptr<ListBox> Allocate();
 
 	virtual void SetFont(const Font *font)=0;
diff --git a/scintilla/src/PositionCache.cxx b/scintilla/src/PositionCache.cxx
index d047c5d49..cd137645a 100644
--- a/scintilla/src/PositionCache.cxx
+++ b/scintilla/src/PositionCache.cxx
@@ -87,11 +87,12 @@ LineLayout::~LineLayout() {
 void LineLayout::Resize(int maxLineLength_) {
 	if (maxLineLength_ > maxLineLength) {
 		Free();
-		chars = std::make_unique<char[]>(maxLineLength_ + 1);
-		styles = std::make_unique<unsigned char []>(maxLineLength_ + 1);
+		const size_t lineAllocation = maxLineLength_ + 1;
+		chars = std::make_unique<char[]>(lineAllocation);
+		styles = std::make_unique<unsigned char []>(lineAllocation);
 		// Extra position allocated as sometimes the Windows
 		// GetTextExtentExPoint API writes an extra element.
-		positions = std::make_unique<XYPOSITION []>(maxLineLength_ + 1 + 1);
+		positions = std::make_unique<XYPOSITION []>(lineAllocation + 1);
 		if (bidiData) {
 			bidiData->Resize(maxLineLength_);
 		}
@@ -115,6 +116,10 @@ void LineLayout::Free() noexcept {
 	bidiData.reset();
 }
 
+void LineLayout::ClearPositions() {
+	std::fill(&positions[0], &positions[maxLineLength + 2], 0.0f);
+}
+
 void LineLayout::Invalidate(ValidLevel validity_) noexcept {
 	if (validity > validity_)
 		validity = validity_;
@@ -186,9 +191,10 @@ int LineLayout::SubLineFromPosition(int posInLine, PointEnd pe) const noexcept {
 	return lines - 1;
 }
 
-void LineLayout::SetLineStart(int line, int start) {
-	if ((line >= lenLineStarts) && (line != 0)) {
-		const int newMaxLines = line + 20;
+void LineLayout::AddLineStart(Sci::Position start) {
+	lines++;
+	if (lines >= lenLineStarts) {
+		const int newMaxLines = lines + 20;
 		std::unique_ptr<int[]> newLineStarts = std::make_unique<int[]>(newMaxLines);
 		if (lenLineStarts) {
 			std::copy(lineStarts.get(), lineStarts.get() + lenLineStarts, newLineStarts.get());
@@ -196,7 +202,7 @@ void LineLayout::SetLineStart(int line, int start) {
 		lineStarts = std::move(newLineStarts);
 		lenLineStarts = newMaxLines;
 	}
-	lineStarts[line] = start;
+	lineStarts[lines] = static_cast<int>(start);
 }
 
 void LineLayout::SetBracesHighlight(Range rangeLine, const Sci::Position braces[],
@@ -299,6 +305,15 @@ Point LineLayout::PointFromPosition(int posInLine, int lineHeight, PointEnd pe)
 	return pt;
 }
 
+XYPOSITION LineLayout::XInLine(Sci::Position index) const noexcept {
+	// For positions inside line return value from positions
+	// For positions after line return last position + 1.0
+	if (index <= numCharsInLine) {
+		return positions[index];
+	}
+	return positions[numCharsInLine] + 1.0;
+}
+
 int LineLayout::EndLineStyle() const noexcept {
 	return styles[numCharsBeforeEOL > 0 ? numCharsBeforeEOL-1 : 0];
 }
@@ -383,7 +398,7 @@ constexpr bool GraphicASCII(char ch) noexcept {
 	return ch >= ' ' && ch <= '~';
 }
 
-bool AllGraphicASCII(std::string_view text) noexcept {
+bool AllGraphicASCII(std::string_view text) {
 	return std::all_of(text.cbegin(), text.cend(), GraphicASCII);
 }
 
@@ -740,7 +755,7 @@ TextSegment BreakFinder::Next() {
 			const unsigned char ch = chars[0];
 			if (!UTF8IsAscii(ch) && encodingFamily != EncodingFamily::eightBit) {
 				if (encodingFamily == EncodingFamily::unicode) {
-					charWidth = UTF8DrawBytes(reinterpret_cast<const unsigned char *>(chars), static_cast<int>(lineRange.end - nextBreak));
+					charWidth = UTF8DrawBytes(chars, lineRange.end - nextBreak);
 				} else {
 					charWidth = pdoc->DBCSDrawBytes(std::string_view(chars, lineRange.end - nextBreak));
 				}
diff --git a/scintilla/src/PositionCache.h b/scintilla/src/PositionCache.h
index 1e92a8058..396648330 100644
--- a/scintilla/src/PositionCache.h
+++ b/scintilla/src/PositionCache.h
@@ -86,6 +86,7 @@ public:
 	void Resize(int maxLineLength_);
 	void EnsureBidiData();
 	void Free() noexcept;
+	void ClearPositions();
 	void Invalidate(ValidLevel validity_) noexcept;
 	Sci::Line LineNumber() const noexcept;
 	bool CanHold(Sci::Line lineDoc, int lineLength_) const noexcept;
@@ -96,13 +97,14 @@ public:
 	Range SubLineRange(int subLine, Scope scope) const noexcept;
 	bool InLine(int offset, int line) const noexcept;
 	int SubLineFromPosition(int posInLine, PointEnd pe) const noexcept;
-	void SetLineStart(int line, int start);
+	void AddLineStart(Sci::Position start);
 	void SetBracesHighlight(Range rangeLine, const Sci::Position braces[],
 		char bracesMatchStyle, int xHighlight, bool ignoreStyle);
 	void RestoreBracesHighlight(Range rangeLine, const Sci::Position braces[], bool ignoreStyle);
 	int FindBefore(XYPOSITION x, Range range) const noexcept;
 	int FindPositionFromX(XYPOSITION x, Range range, bool charPosition) const noexcept;
 	Point PointFromPosition(int posInLine, int lineHeight, PointEnd pe) const noexcept;
+	XYPOSITION XInLine(Sci::Position index) const noexcept;
 	int EndLineStyle() const noexcept;
 };
 
diff --git a/scintilla/src/RESearch.cxx b/scintilla/src/RESearch.cxx
index b39e215d4..2230f02f3 100644
--- a/scintilla/src/RESearch.cxx
+++ b/scintilla/src/RESearch.cxx
@@ -305,6 +305,7 @@ constexpr unsigned char escapeValue(unsigned char ch) noexcept {
 	case 'r':	return '\r';
 	case 't':	return '\t';
 	case 'v':	return '\v';
+	default:	break;
 	}
 	return 0;
 }
@@ -353,7 +354,7 @@ int RESearch::GetBackslashExpression(
 	// I choose to interpret unexpected syntax in a logical way instead
 	// of reporting errors. Otherwise, we can stick on, eg., PCRE behaviour.
 	incr = 0;	// Most of the time, will skip the char "naturally".
-	int c;
+	int c = 0;
 	int result = -1;
 	const unsigned char bsc = *pattern;
 	if (!bsc) {
@@ -433,16 +434,18 @@ int RESearch::GetBackslashExpression(
 
 const char *RESearch::Compile(const char *pattern, Sci::Position length, bool caseSensitive, bool posix) noexcept {
 	char *mp=nfa;          /* nfa pointer       */
-	char *lp;              /* saved pointer     */
+	char *lp=nullptr;      /* saved pointer     */
 	char *sp=nfa;          /* another one       */
-	char *mpMax = mp + MAXNFA - BITBLK - 10;
+	const char * mpMax = mp + MAXNFA - BITBLK - 10;
 
 	int tagi = 0;          /* tag stack index   */
 	int tagc = 1;          /* actual tag count  */
 
-	int n;
-	char mask;             /* xor mask -CCL/NCL */
-	int c1, c2, prevChar;
+	int n = 0;
+	char mask = 0;         /* xor mask -CCL/NCL */
+	int c1 = 0;
+	int c2 = 0;
+	int prevChar = 0;
 
 	if (!pattern || !length) {
 		if (sta)
@@ -753,7 +756,7 @@ const char *RESearch::Compile(const char *pattern, Sci::Position length, bool ca
  *
  */
 int RESearch::Execute(const CharacterIndexer &ci, Sci::Position lp, Sci::Position endp) {
-	unsigned char c;
+	unsigned char c = 0;
 	Sci::Position ep = NOTFOUND;
 	char *ap = nfa;
 
@@ -841,12 +844,14 @@ int RESearch::Execute(const CharacterIndexer &ci, Sci::Position lp, Sci::Positio
 #define CCLSKIP 34	/* [CLO] CCL 32 bytes END */
 
 Sci::Position RESearch::PMatch(const CharacterIndexer &ci, Sci::Position lp, Sci::Position endp, char *ap) {
-	int op, c, n;
-	Sci::Position e;		/* extra pointer for CLO  */
-	Sci::Position bp;		/* beginning of subpat... */
-	Sci::Position ep;		/* ending of subpat...    */
-	Sci::Position are;	/* to save the line ptr.  */
-	Sci::Position llp;	/* lazy lp for LCLO       */
+	int op = 0;
+	int c = 0;
+	int n = 0;
+	Sci::Position e = 0;		/* extra pointer for CLO  */
+	Sci::Position bp = 0;		/* beginning of subpat... */
+	Sci::Position ep = 0;		/* ending of subpat...    */
+	Sci::Position are = 0;	/* to save the line ptr.  */
+	Sci::Position llp = 0;	/* lazy lp for LCLO       */
 
 	while ((op = *ap++) != END)
 		switch (op) {
diff --git a/scintilla/src/RunStyles.cxx b/scintilla/src/RunStyles.cxx
index 94768cbbd..427ae614c 100644
--- a/scintilla/src/RunStyles.cxx
+++ b/scintilla/src/RunStyles.cxx
@@ -31,9 +31,9 @@ using namespace Scintilla::Internal;
 // Find the first run at a position
 template <typename DISTANCE, typename STYLE>
 DISTANCE RunStyles<DISTANCE, STYLE>::RunFromPosition(DISTANCE position) const noexcept {
-	DISTANCE run = starts->PartitionFromPosition(position);
+	DISTANCE run = starts.PartitionFromPosition(position);
 	// Go to first element with this position
-	while ((run > 0) && (position == starts->PositionFromPartition(run-1))) {
+	while ((run > 0) && (position == starts.PositionFromPartition(run-1))) {
 		run--;
 	}
 	return run;
@@ -43,26 +43,26 @@ DISTANCE RunStyles<DISTANCE, STYLE>::RunFromPosition(DISTANCE position) const no
 template <typename DISTANCE, typename STYLE>
 DISTANCE RunStyles<DISTANCE, STYLE>::SplitRun(DISTANCE position) {
 	DISTANCE run = RunFromPosition(position);
-	const DISTANCE posRun = starts->PositionFromPartition(run);
+	const DISTANCE posRun = starts.PositionFromPartition(run);
 	if (posRun < position) {
 		STYLE runStyle = ValueAt(position);
 		run++;
-		starts->InsertPartition(run, position);
-		styles->InsertValue(run, 1, runStyle);
+		starts.InsertPartition(run, position);
+		styles.InsertValue(run, 1, runStyle);
 	}
 	return run;
 }
 
 template <typename DISTANCE, typename STYLE>
 void RunStyles<DISTANCE, STYLE>::RemoveRun(DISTANCE run) {
-	starts->RemovePartition(run);
-	styles->DeleteRange(run, 1);
+	starts.RemovePartition(run);
+	styles.DeleteRange(run, 1);
 }
 
 template <typename DISTANCE, typename STYLE>
 void RunStyles<DISTANCE, STYLE>::RemoveRunIfEmpty(DISTANCE run) {
-	if ((run < starts->Partitions()) && (starts->Partitions() > 1)) {
-		if (starts->PositionFromPartition(run) == starts->PositionFromPartition(run+1)) {
+	if ((run < starts.Partitions()) && (starts.Partitions() > 1)) {
+		if (starts.PositionFromPartition(run) == starts.PositionFromPartition(run+1)) {
 			RemoveRun(run);
 		}
 	}
@@ -70,8 +70,9 @@ void RunStyles<DISTANCE, STYLE>::RemoveRunIfEmpty(DISTANCE run) {
 
 template <typename DISTANCE, typename STYLE>
 void RunStyles<DISTANCE, STYLE>::RemoveRunIfSameAsPrevious(DISTANCE run) {
-	if ((run > 0) && (run < starts->Partitions())) {
-		if (styles->ValueAt(run-1) == styles->ValueAt(run)) {
+	if ((run > 0) && (run < starts.Partitions())) {
+		const DISTANCE runBefore = run - 1;
+		if (styles.ValueAt(runBefore) == styles.ValueAt(run)) {
 			RemoveRun(run);
 		}
 	}
@@ -79,33 +80,29 @@ void RunStyles<DISTANCE, STYLE>::RemoveRunIfSameAsPrevious(DISTANCE run) {
 
 template <typename DISTANCE, typename STYLE>
 RunStyles<DISTANCE, STYLE>::RunStyles() {
-	starts = std::make_unique<Partitioning<DISTANCE>>(8);
-	styles = std::make_unique<SplitVector<STYLE>>();
-	styles->InsertValue(0, 2, 0);
-}
-
-template <typename DISTANCE, typename STYLE>
-RunStyles<DISTANCE, STYLE>::~RunStyles() {
+	starts = Partitioning<DISTANCE>(8);
+	styles = SplitVector<STYLE>();
+	styles.InsertValue(0, 2, 0);
 }
 
 template <typename DISTANCE, typename STYLE>
 DISTANCE RunStyles<DISTANCE, STYLE>::Length() const noexcept {
-	return starts->PositionFromPartition(starts->Partitions());
+	return starts.PositionFromPartition(starts.Partitions());
 }
 
 template <typename DISTANCE, typename STYLE>
 STYLE RunStyles<DISTANCE, STYLE>::ValueAt(DISTANCE position) const noexcept {
-	return styles->ValueAt(starts->PartitionFromPosition(position));
+	return styles.ValueAt(starts.PartitionFromPosition(position));
 }
 
 template <typename DISTANCE, typename STYLE>
 DISTANCE RunStyles<DISTANCE, STYLE>::FindNextChange(DISTANCE position, DISTANCE end) const noexcept {
-	const DISTANCE run = starts->PartitionFromPosition(position);
-	if (run < starts->Partitions()) {
-		const DISTANCE runChange = starts->PositionFromPartition(run);
+	const DISTANCE run = starts.PartitionFromPosition(position);
+	if (run < starts.Partitions()) {
+		const DISTANCE runChange = starts.PositionFromPartition(run);
 		if (runChange > position)
 			return runChange;
-		const DISTANCE nextChange = starts->PositionFromPartition(run + 1);
+		const DISTANCE nextChange = starts.PositionFromPartition(run + 1);
 		if (nextChange > position) {
 			return nextChange;
 		} else if (position < end) {
@@ -120,12 +117,12 @@ DISTANCE RunStyles<DISTANCE, STYLE>::FindNextChange(DISTANCE position, DISTANCE
 
 template <typename DISTANCE, typename STYLE>
 DISTANCE RunStyles<DISTANCE, STYLE>::StartRun(DISTANCE position) const noexcept {
-	return starts->PositionFromPartition(starts->PartitionFromPosition(position));
+	return starts.PositionFromPartition(starts.PartitionFromPosition(position));
 }
 
 template <typename DISTANCE, typename STYLE>
 DISTANCE RunStyles<DISTANCE, STYLE>::EndRun(DISTANCE position) const noexcept {
-	return starts->PositionFromPartition(starts->PartitionFromPosition(position) + 1);
+	return starts.PositionFromPartition(starts.PartitionFromPosition(position) + 1);
 }
 
 template <typename DISTANCE, typename STYLE>
@@ -139,9 +136,9 @@ FillResult<DISTANCE> RunStyles<DISTANCE, STYLE>::FillRange(DISTANCE position, ST
 		return resultNoChange;
 	}
 	DISTANCE runEnd = RunFromPosition(end);
-	if (styles->ValueAt(runEnd) == value) {
+	if (styles.ValueAt(runEnd) == value) {
 		// End already has value so trim range.
-		end = starts->PositionFromPartition(runEnd);
+		end = starts.PositionFromPartition(runEnd);
 		if (position >= end) {
 			// Whole range is already same as value so no action
 			return resultNoChange;
@@ -151,20 +148,20 @@ FillResult<DISTANCE> RunStyles<DISTANCE, STYLE>::FillRange(DISTANCE position, ST
 		runEnd = SplitRun(end);
 	}
 	DISTANCE runStart = RunFromPosition(position);
-	if (styles->ValueAt(runStart) == value) {
+	if (styles.ValueAt(runStart) == value) {
 		// Start is in expected value so trim range.
 		runStart++;
-		position = starts->PositionFromPartition(runStart);
+		position = starts.PositionFromPartition(runStart);
 		fillLength = end - position;
 	} else {
-		if (starts->PositionFromPartition(runStart) < position) {
+		if (starts.PositionFromPartition(runStart) < position) {
 			runStart = SplitRun(position);
 			runEnd++;
 		}
 	}
 	if (runStart < runEnd) {
 		const FillResult<DISTANCE> result{ true, position, fillLength };
-		styles->SetValueAt(runStart, value);
+		styles.SetValueAt(runStart, value);
 		// Remove each old run over the range
 		for (DISTANCE run=runStart+1; run<runEnd; run++) {
 			RemoveRun(runStart+1);
@@ -188,37 +185,37 @@ void RunStyles<DISTANCE, STYLE>::SetValueAt(DISTANCE position, STYLE value) {
 template <typename DISTANCE, typename STYLE>
 void RunStyles<DISTANCE, STYLE>::InsertSpace(DISTANCE position, DISTANCE insertLength) {
 	DISTANCE runStart = RunFromPosition(position);
-	if (starts->PositionFromPartition(runStart) == position) {
+	if (starts.PositionFromPartition(runStart) == position) {
 		STYLE runStyle = ValueAt(position);
 		// Inserting at start of run so make previous longer
 		if (runStart == 0) {
 			// Inserting at start of document so ensure 0
 			if (runStyle) {
-				styles->SetValueAt(0, STYLE());
-				starts->InsertPartition(1, 0);
-				styles->InsertValue(1, 1, runStyle);
-				starts->InsertText(0, insertLength);
+				styles.SetValueAt(0, STYLE());
+				starts.InsertPartition(1, 0);
+				styles.InsertValue(1, 1, runStyle);
+				starts.InsertText(0, insertLength);
 			} else {
-				starts->InsertText(runStart, insertLength);
+				starts.InsertText(runStart, insertLength);
 			}
 		} else {
 			if (runStyle) {
-				starts->InsertText(runStart-1, insertLength);
+				starts.InsertText(runStart-1, insertLength);
 			} else {
 				// Insert at end of run so do not extend style
-				starts->InsertText(runStart, insertLength);
+				starts.InsertText(runStart, insertLength);
 			}
 		}
 	} else {
-		starts->InsertText(runStart, insertLength);
+		starts.InsertText(runStart, insertLength);
 	}
 }
 
 template <typename DISTANCE, typename STYLE>
 void RunStyles<DISTANCE, STYLE>::DeleteAll() {
-	starts = std::make_unique<Partitioning<DISTANCE>>(8);
-	styles = std::make_unique<SplitVector<STYLE>>();
-	styles->InsertValue(0, 2, 0);
+	starts = Partitioning<DISTANCE>(8);
+	styles = SplitVector<STYLE>();
+	styles.InsertValue(0, 2, 0);
 }
 
 template <typename DISTANCE, typename STYLE>
@@ -228,12 +225,12 @@ void RunStyles<DISTANCE, STYLE>::DeleteRange(DISTANCE position, DISTANCE deleteL
 	DISTANCE runEnd = RunFromPosition(end);
 	if (runStart == runEnd) {
 		// Deleting from inside one run
-		starts->InsertText(runStart, -deleteLength);
+		starts.InsertText(runStart, -deleteLength);
 		RemoveRunIfEmpty(runStart);
 	} else {
 		runStart = SplitRun(position);
 		runEnd = SplitRun(end);
-		starts->InsertText(runStart, -deleteLength);
+		starts.InsertText(runStart, -deleteLength);
 		// Remove each old run over the range
 		for (DISTANCE run=runStart; run<runEnd; run++) {
 			RemoveRun(runStart);
@@ -245,13 +242,14 @@ void RunStyles<DISTANCE, STYLE>::DeleteRange(DISTANCE position, DISTANCE deleteL
 
 template <typename DISTANCE, typename STYLE>
 DISTANCE RunStyles<DISTANCE, STYLE>::Runs() const noexcept {
-	return starts->Partitions();
+	return starts.Partitions();
 }
 
 template <typename DISTANCE, typename STYLE>
 bool RunStyles<DISTANCE, STYLE>::AllSame() const noexcept {
-	for (DISTANCE run = 1; run < starts->Partitions(); run++) {
-		if (styles->ValueAt(run) != styles->ValueAt(run - 1))
+	for (DISTANCE run = 1; run < starts.Partitions(); run++) {
+		const DISTANCE runBefore = run - 1;
+		if (styles.ValueAt(run) != styles.ValueAt(runBefore))
 			return false;
 	}
 	return true;
@@ -259,19 +257,19 @@ bool RunStyles<DISTANCE, STYLE>::AllSame() const noexcept {
 
 template <typename DISTANCE, typename STYLE>
 bool RunStyles<DISTANCE, STYLE>::AllSameAs(STYLE value) const noexcept {
-	return AllSame() && (styles->ValueAt(0) == value);
+	return AllSame() && (styles.ValueAt(0) == value);
 }
 
 template <typename DISTANCE, typename STYLE>
 DISTANCE RunStyles<DISTANCE, STYLE>::Find(STYLE value, DISTANCE start) const noexcept {
 	if (start < Length()) {
 		DISTANCE run = start ? RunFromPosition(start) : 0;
-		if (styles->ValueAt(run) == value)
+		if (styles.ValueAt(run) == value)
 			return start;
 		run++;
-		while (run < starts->Partitions()) {
-			if (styles->ValueAt(run) == value)
-				return starts->PositionFromPartition(run);
+		while (run < starts.Partitions()) {
+			if (styles.ValueAt(run) == value)
+				return starts.PositionFromPartition(run);
 			run++;
 		}
 	}
@@ -283,10 +281,10 @@ void RunStyles<DISTANCE, STYLE>::Check() const {
 	if (Length() < 0) {
 		throw std::runtime_error("RunStyles: Length can not be negative.");
 	}
-	if (starts->Partitions() < 1) {
+	if (starts.Partitions() < 1) {
 		throw std::runtime_error("RunStyles: Must always have 1 or more partitions.");
 	}
-	if (starts->Partitions() != styles->Length()-1) {
+	if (starts.Partitions() != styles.Length()-1) {
 		throw std::runtime_error("RunStyles: Partitions and styles different lengths.");
 	}
 	DISTANCE start=0;
@@ -297,11 +295,11 @@ void RunStyles<DISTANCE, STYLE>::Check() const {
 		}
 		start = end;
 	}
-	if (styles->ValueAt(styles->Length()-1) != 0) {
+	if (styles.ValueAt(styles.Length()-1) != 0) {
 		throw std::runtime_error("RunStyles: Unused style at end changed.");
 	}
-	for (ptrdiff_t j=1; j<styles->Length()-1; j++) {
-		if (styles->ValueAt(j) == styles->ValueAt(j-1)) {
+	for (ptrdiff_t j=1; j<styles.Length()-1; j++) {
+		if (styles.ValueAt(j) == styles.ValueAt(j-1)) {
 			throw std::runtime_error("RunStyles: Style of a partition same as previous.");
 		}
 	}
diff --git a/scintilla/src/RunStyles.h b/scintilla/src/RunStyles.h
index b010d7e03..2ce6f83b9 100644
--- a/scintilla/src/RunStyles.h
+++ b/scintilla/src/RunStyles.h
@@ -25,8 +25,8 @@ struct FillResult {
 template <typename DISTANCE, typename STYLE>
 class RunStyles {
 private:
-	std::unique_ptr<Partitioning<DISTANCE>> starts;
-	std::unique_ptr<SplitVector<STYLE>> styles;
+	Partitioning<DISTANCE> starts;
+	SplitVector<STYLE> styles;
 	DISTANCE RunFromPosition(DISTANCE position) const noexcept;
 	DISTANCE SplitRun(DISTANCE position);
 	void RemoveRun(DISTANCE run);
@@ -34,12 +34,6 @@ private:
 	void RemoveRunIfSameAsPrevious(DISTANCE run);
 public:
 	RunStyles();
-	// Deleted so RunStyles objects can not be copied.
-	RunStyles(const RunStyles &) = delete;
-	RunStyles(RunStyles &&) = delete;
-	void operator=(const RunStyles &) = delete;
-	void operator=(RunStyles &&) = delete;
-	~RunStyles();
 	DISTANCE Length() const noexcept;
 	STYLE ValueAt(DISTANCE position) const noexcept;
 	DISTANCE FindNextChange(DISTANCE position, DISTANCE end) const noexcept;
diff --git a/scintilla/src/SparseVector.h b/scintilla/src/SparseVector.h
index 31636165a..09eb1f98d 100644
--- a/scintilla/src/SparseVector.h
+++ b/scintilla/src/SparseVector.h
@@ -19,141 +19,149 @@ namespace Scintilla::Internal {
 template <typename T>
 class SparseVector {
 private:
-	std::unique_ptr<Partitioning<Sci::Position>> starts;
-	std::unique_ptr<SplitVector<T>> values;
+	Partitioning<Sci::Position> starts;
+	SplitVector<T> values;
 	T empty;	// Return from ValueAt when no element at a position.
 	void ClearValue(Sci::Position partition) noexcept {
-		values->SetValueAt(partition, T());
+		values.SetValueAt(partition, T());
 	}
 public:
 	SparseVector() : empty() {
-		starts = std::make_unique<Partitioning<Sci::Position>>(8);
-		values = std::make_unique<SplitVector<T>>();
-		values->InsertEmpty(0, 2);
-	}
-	// Deleted so SparseVector objects can not be copied.
-	SparseVector(const SparseVector &) = delete;
-	SparseVector(SparseVector &&) = delete;
-	void operator=(const SparseVector &) = delete;
-	void operator=(SparseVector &&) = delete;
-	~SparseVector() {
-		starts.reset();
-		// starts dead here but not used by ClearValue.
-		for (Sci::Position part = 0; part < values->Length(); part++) {
-			ClearValue(part);
-		}
-		values.reset();
+		starts = Partitioning<Sci::Position>(8);
+		values = SplitVector<T>();
+		values.InsertEmpty(0, 2);
 	}
 	Sci::Position Length() const noexcept {
-		return starts->Length();
+		return starts.Length();
 	}
 	Sci::Position Elements() const noexcept {
-		return starts->Partitions();
+		return starts.Partitions();
 	}
 	Sci::Position PositionOfElement(Sci::Position element) const noexcept {
-		return starts->PositionFromPartition(element);
+		return starts.PositionFromPartition(element);
 	}
 	Sci::Position ElementFromPosition(Sci::Position position) const noexcept {
 		if (position < Length()) {
-			return starts->PartitionFromPosition(position);
+			return starts.PartitionFromPosition(position);
 		} else {
-			return starts->Partitions();
+			return starts.Partitions();
 		}
 	}
 	const T& ValueAt(Sci::Position position) const noexcept {
 		assert(position <= Length());
 		const Sci::Position partition = ElementFromPosition(position);
-		const Sci::Position startPartition = starts->PositionFromPartition(partition);
+		const Sci::Position startPartition = starts.PositionFromPartition(partition);
 		if (startPartition == position) {
-			return values->ValueAt(partition);
+			return values.ValueAt(partition);
 		} else {
 			return empty;
 		}
 	}
+	T Extract(Sci::Position position) {
+		// Move value currently at position; clear and remove position; return value.
+		// Doesn't remove position at start or end.
+		assert(position <= Length());
+		const Sci::Position partition = ElementFromPosition(position);
+		assert(partition >= 0);
+		assert(partition <= starts.Partitions());
+		assert(starts.PositionFromPartition(partition) == position);
+		T value = std::move(values.operator[](partition));
+		if ((partition > 0) && (partition < starts.Partitions())) {
+			starts.RemovePartition(partition);
+			values.Delete(partition);
+		}
+		Check();
+		return value;
+	}
 	template <typename ParamType>
 	void SetValueAt(Sci::Position position, ParamType &&value) {
 		assert(position <= Length());
 		const Sci::Position partition = ElementFromPosition(position);
-		const Sci::Position startPartition = starts->PositionFromPartition(partition);
+		const Sci::Position startPartition = starts.PositionFromPartition(partition);
 		if (value == T()) {
 			// Setting the empty value is equivalent to deleting the position
-			if (position == 0) {
+			if (position == 0 || position == Length()) {
 				ClearValue(partition);
 			} else if (position == startPartition) {
 				// Currently an element at this position, so remove
 				ClearValue(partition);
-				starts->RemovePartition(partition);
-				values->Delete(partition);
+				starts.RemovePartition(partition);
+				values.Delete(partition);
 			}
 			// Else element remains empty
 		} else {
 			if (position == startPartition) {
 				// Already a value at this position, so replace
 				ClearValue(partition);
-				values->SetValueAt(partition, std::forward<ParamType>(value));
+				values.SetValueAt(partition, std::forward<ParamType>(value));
 			} else {
 				// Insert a new element
-				starts->InsertPartition(partition + 1, position);
-				values->Insert(partition + 1, std::forward<ParamType>(value));
+				starts.InsertPartition(partition + 1, position);
+				values.Insert(partition + 1, std::forward<ParamType>(value));
 			}
 		}
 	}
 	void InsertSpace(Sci::Position position, Sci::Position insertLength) {
 		assert(position <= Length());
-		const Sci::Position partition = starts->PartitionFromPosition(position);
-		const Sci::Position startPartition = starts->PositionFromPartition(partition);
+		const Sci::Position partition = starts.PartitionFromPosition(position);
+		const Sci::Position startPartition = starts.PositionFromPartition(partition);
 		if (startPartition == position) {
-			const bool positionOccupied = values->ValueAt(partition) != T();
+			const bool positionOccupied = values.ValueAt(partition) != T();
 			// Inserting at start of run so make previous longer
 			if (partition == 0) {
 				// Inserting at start of document so ensure start empty
 				if (positionOccupied) {
-					starts->InsertPartition(1, 0);
-					values->InsertEmpty(0, 1);
+					starts.InsertPartition(1, 0);
+					values.InsertEmpty(0, 1);
 				}
-				starts->InsertText(partition, insertLength);
+				starts.InsertText(partition, insertLength);
 			} else {
 				if (positionOccupied) {
-					starts->InsertText(partition - 1, insertLength);
+					starts.InsertText(partition - 1, insertLength);
 				} else {
 					// Insert at end of run so do not extend style
-					starts->InsertText(partition, insertLength);
+					starts.InsertText(partition, insertLength);
 				}
 			}
 		} else {
-			starts->InsertText(partition, insertLength);
+			starts.InsertText(partition, insertLength);
 		}
 	}
 	void DeletePosition(Sci::Position position) {
 		assert(position < Length());
-		Sci::Position partition = starts->PartitionFromPosition(position);
-		const Sci::Position startPartition = starts->PositionFromPartition(partition);
+		Sci::Position partition = starts.PartitionFromPosition(position);
+		const Sci::Position startPartition = starts.PositionFromPartition(partition);
 		if (startPartition == position) {
 			if (partition == 0) {
 				ClearValue(0);
-				if (starts->PositionFromPartition(1) == 1) {
+				if (starts.PositionFromPartition(1) == 1) {
 					// Removing all space of first partition, so remove next partition
 					// and move value if not last
 					if (Elements() > 1) {
-						starts->RemovePartition(partition + 1);
-						values->Delete(partition);
+						starts.RemovePartition(partition + 1);
+						values.Delete(partition);
 					}
 				}
-			} else if (partition == starts->Partitions()) {
+			} else if (partition == starts.Partitions()) {
 				// This should not be possible
 				ClearValue(partition);
 				throw std::runtime_error("SparseVector: deleting end partition.");
 			} else {
 				ClearValue(partition);
-				starts->RemovePartition(partition);
-				values->Delete(partition);
+				starts.RemovePartition(partition);
+				values.Delete(partition);
 				// Its the previous partition now that gets smaller
 				partition--;
 			}
 		}
-		starts->InsertText(partition, -1);
+		starts.InsertText(partition, -1);
 		Check();
 	}
+	void DeleteAll() {
+		starts = Partitioning<Sci::Position>(8);
+		values = SplitVector<T>();
+		values.InsertEmpty(0, 2);
+	}
 	void DeleteRange(Sci::Position position, Sci::Position deleteLength) {
 		// For now, delete elements in range - may want to leave value at start
 		// or combine onto position.
@@ -164,44 +172,51 @@ public:
 		assert(positionEnd <= Length());
 		if (position == 0) {
 			// Remove all partitions in range, moving values to start
-			while ((Elements() > 1) && (starts->PositionFromPartition(1) <= deleteLength)) {
-				starts->RemovePartition(1);
-				values->Delete(0);
+			while ((Elements() > 1) && (starts.PositionFromPartition(1) <= deleteLength)) {
+				starts.RemovePartition(1);
+				values.Delete(0);
 			}
-			starts->InsertText(0, -deleteLength);
+			starts.InsertText(0, -deleteLength);
 			if (Length() == 0) {
 				ClearValue(0);
 			}
 		} else {
-			const Sci::Position partition = starts->PartitionFromPosition(position);
-			const bool atPartitionStart = position == starts->PositionFromPartition(partition);
+			const Sci::Position partition = starts.PartitionFromPosition(position);
+			const bool atPartitionStart = position == starts.PositionFromPartition(partition);
 			const Sci::Position partitionDelete = partition + (atPartitionStart ? 0 : 1);
 			assert(partitionDelete > 0);
 			for (;;) {
-				const Sci::Position positionAtIndex = starts->PositionFromPartition(partitionDelete);
+				const Sci::Position positionAtIndex = starts.PositionFromPartition(partitionDelete);
 				assert(position <= positionAtIndex);
 				if (positionAtIndex >= positionEnd) {
 					break;
 				}
 				assert(partitionDelete <= Elements());
-				starts->RemovePartition(partitionDelete);
-				values->Delete(partitionDelete);
+				starts.RemovePartition(partitionDelete);
+				values.Delete(partitionDelete);
 			}
-			starts->InsertText(partition - (atPartitionStart ? 1 : 0), -deleteLength);
+			starts.InsertText(partition - (atPartitionStart ? 1 : 0), -deleteLength);
 		}
 		Check();
 	}
+	Sci::Position PositionNext(Sci::Position start) const noexcept {
+		const Sci::Position element = ElementFromPosition(start);
+		if (element < Elements()) {
+			return PositionOfElement(element + 1);
+		}
+		return Length() + 1;	// Out of bounds to terminate
+	}
 	Sci::Position IndexAfter(Sci::Position position) const noexcept {
 		assert(position < Length());
 		if (position < 0)
 			return 0;
-		const Sci::Position partition = starts->PartitionFromPosition(position);
+		const Sci::Position partition = starts.PartitionFromPosition(position);
 		return partition + 1;
 	}
 	void Check() const {
 #ifdef CHECK_CORRECTNESS
-		starts->Check();
-		if (starts->Partitions() != values->Length() - 1) {
+		starts.Check();
+		if (starts.Partitions() != values.Length() - 1) {
 			throw std::runtime_error("SparseVector: Partitions and values different lengths.");
 		}
 #endif
diff --git a/scintilla/src/SplitVector.h b/scintilla/src/SplitVector.h
index 15f2963fc..4889ce4eb 100644
--- a/scintilla/src/SplitVector.h
+++ b/scintilla/src/SplitVector.h
@@ -19,7 +19,7 @@ protected:
 	ptrdiff_t lengthBody;
 	ptrdiff_t part1Length;
 	ptrdiff_t gapLength;	/// invariant: gapLength == body.size() - lengthBody
-	ptrdiff_t growSize;
+	size_t growSize;
 
 	/// Move the gap to a particular position so that insertion and
 	/// deletion at that point will not require much copying and
@@ -54,7 +54,7 @@ protected:
 	/// reallocating if more space needed.
 	void RoomFor(ptrdiff_t insertionLength) {
 		if (gapLength < insertionLength) {
-			while (growSize < static_cast<ptrdiff_t>(body.size() / 6))
+			while (growSize < body.size() / 6)
 				growSize *= 2;
 			ReAllocate(body.size() + insertionLength + growSize);
 		}
@@ -71,37 +71,25 @@ protected:
 
 public:
 	/// Construct a split buffer.
-	SplitVector() : empty(), lengthBody(0), part1Length(0), gapLength(0), growSize(8) {
+	SplitVector(size_t growSize_=8) : empty(), lengthBody(0), part1Length(0), gapLength(0), growSize(growSize_) {
 	}
 
-	// Deleted so SplitVector objects can not be copied.
-	SplitVector(const SplitVector &) = delete;
-	SplitVector(SplitVector &&) = delete;
-	void operator=(const SplitVector &) = delete;
-	void operator=(SplitVector &&) = delete;
-
-	~SplitVector() {
-	}
-
-	ptrdiff_t GetGrowSize() const noexcept {
+	size_t GetGrowSize() const noexcept {
 		return growSize;
 	}
 
-	void SetGrowSize(ptrdiff_t growSize_) noexcept {
+	void SetGrowSize(size_t growSize_) noexcept {
 		growSize = growSize_;
 	}
 
 	/// Reallocate the storage for the buffer to be newSize and
 	/// copy existing contents to the new buffer.
 	/// Must not be used to decrease the size of the buffer.
-	void ReAllocate(ptrdiff_t newSize) {
-		if (newSize < 0)
-			throw std::runtime_error("SplitVector::ReAllocate: negative size.");
-
-		if (newSize > static_cast<ptrdiff_t>(body.size())) {
+	void ReAllocate(size_t newSize) {
+		if (newSize > body.size()) {
 			// Move the gap to the end
 			GapTo(lengthBody);
-			gapLength += newSize - static_cast<ptrdiff_t>(body.size());
+			gapLength += newSize - body.size();
 			// RoomFor implements a growth strategy but so does vector::resize so
 			// ensure vector::resize allocates exactly the amount wanted by
 			// calling reserve first.
diff --git a/scintilla/src/UniConversion.cxx b/scintilla/src/UniConversion.cxx
index 0e99968d1..12f4296ab 100644
--- a/scintilla/src/UniConversion.cxx
+++ b/scintilla/src/UniConversion.cxx
@@ -358,8 +358,8 @@ int UTF8Classify(const unsigned char *us, size_t len) noexcept {
 	return UTF8MaskInvalid | 1;
 }
 
-int UTF8DrawBytes(const unsigned char *us, int len) noexcept {
-	const int utf8StatusNext = UTF8Classify(us, len);
+int UTF8DrawBytes(const char *s, size_t len) noexcept {
+	const int utf8StatusNext = UTF8Classify(reinterpret_cast<const unsigned char *>(s), len);
 	return (utf8StatusNext & UTF8MaskInvalid) ? 1 : (utf8StatusNext & UTF8MaskWidth);
 }
 
diff --git a/scintilla/src/UniConversion.h b/scintilla/src/UniConversion.h
index 891cf3270..6fbe7f58f 100644
--- a/scintilla/src/UniConversion.h
+++ b/scintilla/src/UniConversion.h
@@ -65,7 +65,7 @@ inline int UTF8Classify(std::string_view sv) noexcept {
 
 // Similar to UTF8Classify but returns a length of 1 for invalid bytes
 // instead of setting the invalid flag
-int UTF8DrawBytes(const unsigned char *us, int len) noexcept;
+int UTF8DrawBytes(const char *s, size_t len) noexcept;
 
 // Line separator is U+2028 \xe2\x80\xa8
 // Paragraph separator is U+2029 \xe2\x80\xa9
diff --git a/scintilla/src/UniqueString.cxx b/scintilla/src/UniqueString.cxx
index 0550a0b8c..4c5b4b231 100644
--- a/scintilla/src/UniqueString.cxx
+++ b/scintilla/src/UniqueString.cxx
@@ -30,8 +30,6 @@ UniqueString UniqueStringCopy(const char *text) {
 
 UniqueStringSet::UniqueStringSet() = default;
 
-UniqueStringSet::~UniqueStringSet() noexcept = default;
-
 void UniqueStringSet::Clear() noexcept {
 	strings.clear();
 }
diff --git a/scintilla/src/UniqueString.h b/scintilla/src/UniqueString.h
index 8d611992c..c5617e1c9 100644
--- a/scintilla/src/UniqueString.h
+++ b/scintilla/src/UniqueString.h
@@ -30,13 +30,6 @@ private:
 	std::vector<UniqueString> strings;
 public:
 	UniqueStringSet();
-	// UniqueStringSet objects can not be copied.
-	UniqueStringSet(const UniqueStringSet &) = delete;
-	UniqueStringSet &operator=(const UniqueStringSet &) = delete;
-	// UniqueStringSet objects can be moved.
-	UniqueStringSet(UniqueStringSet &&) = default;
-	UniqueStringSet &operator=(UniqueStringSet &&) = default;
-	~UniqueStringSet() noexcept;
 	void Clear() noexcept;
 	const char *Save(const char *text);
 };
diff --git a/scintilla/src/ViewStyle.cxx b/scintilla/src/ViewStyle.cxx
index 548d876e8..9eed8849c 100644
--- a/scintilla/src/ViewStyle.cxx
+++ b/scintilla/src/ViewStyle.cxx
@@ -104,6 +104,49 @@ ViewStyle::ViewStyle(size_t stylesSize_) :
 	indicators[1] = Indicator(IndicatorStyle::TT, ColourRGBA(0, 0, 0xff));
 	indicators[2] = Indicator(IndicatorStyle::Plain, ColourRGBA(0xff, 0, 0));
 
+	// Reverted to origin
+	constexpr ColourRGBA revertedToOrigin(0x40, 0xA0, 0xBF);
+	// Saved
+	constexpr ColourRGBA saved(0x0, 0xA0, 0x0);
+	// Modified
+	constexpr ColourRGBA modified(0xFF, 0x80, 0x0);
+	// Reverted to change
+	constexpr ColourRGBA revertedToChange(0xA0, 0xC0, 0x0);
+
+	// Edition indicators
+	constexpr size_t indexHistory = static_cast<size_t>(IndicatorNumbers::HistoryRevertedToOriginInsertion);
+
+	indicators[indexHistory+0] = Indicator(IndicatorStyle::CompositionThick, revertedToOrigin, false, 30, 60);
+	indicators[indexHistory+1] = Indicator(IndicatorStyle::Point, revertedToOrigin);
+	indicators[indexHistory+2] = Indicator(IndicatorStyle::CompositionThick, saved, false, 30, 60);
+	indicators[indexHistory+3] = Indicator(IndicatorStyle::Point, saved);
+	indicators[indexHistory+4] = Indicator(IndicatorStyle::CompositionThick, modified, false, 30, 60);
+	indicators[indexHistory+5] = Indicator(IndicatorStyle::PointTop, modified);
+	indicators[indexHistory+6] = Indicator(IndicatorStyle::CompositionThick, revertedToChange, false, 30, 60);
+	indicators[indexHistory+7] = Indicator(IndicatorStyle::Point, revertedToChange);
+
+	// Edition markers
+	// Reverted to origin
+	constexpr size_t indexHistoryRevertedToOrigin = static_cast<size_t>(MarkerOutline::HistoryRevertedToOrigin);
+	markers[indexHistoryRevertedToOrigin].back = revertedToOrigin;
+	markers[indexHistoryRevertedToOrigin].fore = revertedToOrigin;
+	markers[indexHistoryRevertedToOrigin].markType = MarkerSymbol::Bar;
+	// Saved
+	constexpr size_t indexHistorySaved = static_cast<size_t>(MarkerOutline::HistorySaved);
+	markers[indexHistorySaved].back = saved;
+	markers[indexHistorySaved].fore = saved;
+	markers[indexHistorySaved].markType = MarkerSymbol::Bar;
+	// Modified
+	constexpr size_t indexHistoryModified = static_cast<size_t>(MarkerOutline::HistoryModified);
+	markers[indexHistoryModified].back = Platform::Chrome();
+	markers[indexHistoryModified].fore = modified;
+	markers[indexHistoryModified].markType = MarkerSymbol::Bar;
+	// Reverted to change
+	constexpr size_t indexHistoryRevertedToModified = static_cast<size_t>(MarkerOutline::HistoryRevertedToModified);
+	markers[indexHistoryRevertedToModified].back = revertedToChange;
+	markers[indexHistoryRevertedToModified].fore = revertedToChange;
+	markers[indexHistoryRevertedToModified].markType = MarkerSymbol::Bar;
+
 	technology = Technology::Default;
 	indicatorsDynamic = false;
 	indicatorsSetFore = false;
@@ -241,6 +284,7 @@ ViewStyle::ViewStyle(const ViewStyle &source) : ViewStyle(source.styles.size())
 	ms = source.ms;
 	maskInLine = source.maskInLine;
 	maskDrawInText = source.maskDrawInText;
+	maskDrawWrapped = source.maskDrawWrapped;
 	fixedColumnWidth = source.fixedColumnWidth;
 	marginInside = source.marginInside;
 	textStart = source.textStart;
@@ -304,6 +348,17 @@ void ViewStyle::CalculateMarginWidthAndMask() noexcept {
 			break;
 		}
 	}
+	maskDrawWrapped = 0;
+	for (int markBit = 0; markBit < 32; markBit++) {
+		const int maskBit = 1U << markBit;
+		switch (markers[markBit].markType) {
+		case MarkerSymbol::Bar:
+			maskDrawWrapped |= maskBit;
+			break;
+		default:	// Other marker types do not affect the masks
+			break;
+		}
+	}
 }
 
 void ViewStyle::Refresh(Surface &surface, int tabInChars) {
@@ -450,6 +505,9 @@ void ViewStyle::CalcLargestMarkerHeight() noexcept {
 			if (marker.image && marker.image->GetHeight() > largestMarkerHeight)
 				largestMarkerHeight = marker.image->GetHeight();
 			break;
+		case MarkerSymbol::Bar:
+			largestMarkerHeight = lineHeight + 2;
+			break;
 		default:	// Only images have their own natural heights
 			break;
 		}
@@ -711,10 +769,15 @@ FontRealised *ViewStyle::Find(const FontSpecification &fs) {
 }
 
 void ViewStyle::FindMaxAscentDescent() noexcept {
-	for (const auto &font : fonts) {
-		if (maxAscent < font.second->measurements.ascent)
-			maxAscent = font.second->measurements.ascent;
-		if (maxDescent < font.second->measurements.descent)
-			maxDescent = font.second->measurements.descent;
+	for (size_t i = 0; i < styles.size(); i++) {
+		if (i == StyleCallTip)
+			continue;
+
+		const auto &style = styles[i];
+
+		if (maxAscent < style.ascent)
+			maxAscent = style.ascent;
+		if (maxDescent < style.descent)
+			maxDescent = style.descent;
 	}
 }
diff --git a/scintilla/src/ViewStyle.h b/scintilla/src/ViewStyle.h
index 78f233e94..d4fdc87b2 100644
--- a/scintilla/src/ViewStyle.h
+++ b/scintilla/src/ViewStyle.h
@@ -46,6 +46,8 @@ inline std::optional<ColourRGBA> OptionalColour(Scintilla::uptr_t wParam, Scinti
 }
 
 struct SelectionAppearance {
+	// Is the selection visible?
+	bool visible = true;
 	// Whether to draw on base layer or over text
 	Scintilla::Layer layer = Layer::Base;
 	// Draw selection past line end characters up to right border
@@ -139,6 +141,7 @@ public:
 	int rightMarginWidth;	///< Spacing margin on right of text
 	int maskInLine = 0;	///< Mask for markers to be put into text because there is nowhere for them to go in margin
 	int maskDrawInText = 0;	///< Mask for markers that always draw in text
+	int maskDrawWrapped = 0;	///< Mask for markers that draw on wrapped lines
 	std::vector<MarginStyle> ms;
 	int fixedColumnWidth = 0;	///< Total width of margins
 	bool marginInside;	///< true: margin included in text view, false: separate views
diff --git a/scintilla/test/simpleTests.py b/scintilla/test/simpleTests.py
index 758a85d64..7ea601ad0 100644
--- a/scintilla/test/simpleTests.py
+++ b/scintilla/test/simpleTests.py
@@ -2201,6 +2201,13 @@ class TestElements(unittest.TestCase):
 		self.ed.ResetElementColour(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE)
 		self.ed.ResetElementColour(self.ed.SC_ELEMENT_HOT_SPOT_ACTIVE_BACK)
 
+	def testHideSelection(self):
+		self.assertEquals(self.ed.SelectionHidden, False)
+		self.ed.HideSelection(True)
+		self.assertEquals(self.ed.SelectionHidden, True)
+		self.ed.HideSelection(False)	# Restore
+		self.assertEquals(self.ed.SelectionHidden, False)
+		
 class TestIndices(unittest.TestCase):
 	def setUp(self):
 		self.xite = Xite.xiteFrame
diff --git a/scintilla/test/unit/Sci.natvis b/scintilla/test/unit/Sci.natvis
index 44d487c9e..bde059d82 100644
--- a/scintilla/test/unit/Sci.natvis
+++ b/scintilla/test/unit/Sci.natvis
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-  <Type Name="Scintilla::SplitVector&lt;*&gt;">
+  <Type Name="Scintilla::Internal::SplitVector&lt;*&gt;">
     <DisplayString>{{size = {lengthBody}}}</DisplayString>
     <Expand>
       <Item Name="[size]">lengthBody</Item>
@@ -12,7 +12,20 @@
       </IndexListItems>
     </Expand>
   </Type>
-  <Type Name="Scintilla::Partitioning&lt;*&gt;">
+  <Type Name="Scintilla::Internal::XSparseVector&lt;*&gt;">
+    <DisplayString>{{size = {values->lengthBody}}}</DisplayString>
+    <Expand>
+      <IndexListItems>
+        <Size>values->lengthBody</Size>
+        <ValueNode>starts->body->body[($i&lt;starts->body->part1Length)?$i:$i+starts->body->gapLength]+($i&gt;starts->stepPartition?starts->stepLength:0)</ValueNode>
+      </IndexListItems>
+      <IndexListItems>
+        <Size>values->lengthBody</Size>
+        <ValueNode>values->body->body[($i&lt;values->body->part1Length)?$i:$i+values->body->gapLength]+($i&gt;values->stepPartition?values->stepLength:0)</ValueNode>
+      </IndexListItems>
+    </Expand>
+  </Type>
+  <Type Name="Scintilla::Internal::Partitioning&lt;*&gt;">
     <DisplayString>{{size = {body->lengthBody}}}</DisplayString>
     <Expand>
       <IndexListItems>
diff --git a/scintilla/test/unit/UnitTester.vcxproj b/scintilla/test/unit/UnitTester.vcxproj
index ff989211e..d5879c27b 100644
--- a/scintilla/test/unit/UnitTester.vcxproj
+++ b/scintilla/test/unit/UnitTester.vcxproj
@@ -22,32 +22,32 @@
     <ProjectGuid>{35688A27-D91B-453A-8A05-65A7F28DEFBF}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>UnitTester</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -74,6 +74,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
+    <CodeAnalysisRuleSet>..\..\..\..\..\Users\Neil\SensibleRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -153,6 +155,7 @@
     <ClCompile Include="..\..\src\CaseConvert.cxx" />
     <ClCompile Include="..\..\src\CaseFolder.cxx" />
     <ClCompile Include="..\..\src\CellBuffer.cxx" />
+    <ClCompile Include="..\..\src\ChangeHistory.cxx" />
     <ClCompile Include="..\..\src\CharacterCategoryMap.cxx" />
     <ClCompile Include="..\..\src\CharClassify.cxx" />
     <ClCompile Include="..\..\src\ContractionState.cxx" />
diff --git a/scintilla/test/unit/makefile b/scintilla/test/unit/makefile
index 2c721e7e9..a43a06087 100644
--- a/scintilla/test/unit/makefile
+++ b/scintilla/test/unit/makefile
@@ -56,6 +56,7 @@ TESTEDSRC=\
  ../../src/CaseConvert.cxx \
  ../../src/CaseFolder.cxx \
  ../../src/CellBuffer.cxx \
+ ../../src/ChangeHistory.cxx \
  ../../src/CharacterCategoryMap.cxx \
  ../../src/CharClassify.cxx \
  ../../src/ContractionState.cxx \
diff --git a/scintilla/test/unit/test.mak b/scintilla/test/unit/test.mak
index f75cfdbd3..10a6ebac7 100644
--- a/scintilla/test/unit/test.mak
+++ b/scintilla/test/unit/test.mak
@@ -6,7 +6,7 @@ EXE = unitTest.exe
 
 INCLUDEDIRS = /I../../include /I../../src
 
-CXXFLAGS = /EHsc /std:c++17 $(OPTIMIZATION) /nologo /D_HAS_AUTO_PTR_ETC=1 /wd 4805 $(INCLUDEDIRS)
+CXXFLAGS = /MP /EHsc /std:c++17 $(OPTIMIZATION) /nologo /D_HAS_AUTO_PTR_ETC=1 /wd 4805 $(INCLUDEDIRS)
 
 # Files in this directory containing tests
 TESTSRC=test*.cxx
@@ -15,6 +15,7 @@ TESTEDSRC=\
  ../../src/CaseConvert.cxx \
  ../../src/CaseFolder.cxx \
  ../../src/CellBuffer.cxx \
+ ../../src/ChangeHistory.cxx \
  ../../src/CharacterCategoryMap.cxx \
  ../../src/CharClassify.cxx \
  ../../src/ContractionState.cxx \
diff --git a/scintilla/test/unit/testCellBuffer.cxx b/scintilla/test/unit/testCellBuffer.cxx
index ef7db099b..b6735339a 100644
--- a/scintilla/test/unit/testCellBuffer.cxx
+++ b/scintilla/test/unit/testCellBuffer.cxx
@@ -3,6 +3,7 @@
  **/
 
 #include <cstddef>
+#include <cassert>
 #include <cstring>
 #include <stdexcept>
 #include <string_view>
@@ -19,6 +20,8 @@
 #include "SplitVector.h"
 #include "Partitioning.h"
 #include "RunStyles.h"
+#include "SparseVector.h"
+#include "ChangeHistory.h"
 #include "CellBuffer.h"
 
 #include "catch.hpp"
@@ -37,7 +40,7 @@ TEST_CASE("CellBuffer") {
 
 	SECTION("InsertOneLine") {
 		bool startSequence = false;
-		const char *cpChange = cb.InsertString(0, sText, static_cast<int>(sLength), startSequence);
+		const char *cpChange = cb.InsertString(0, sText, sLength, startSequence);
 		REQUIRE(startSequence);
 		REQUIRE(sLength == cb.Length());
 		REQUIRE(memcmp(cpChange, sText, sLength) == 0);
@@ -54,7 +57,7 @@ TEST_CASE("CellBuffer") {
 		const char sText2[] = "Two\nLines";
 		const Sci::Position sLength2 = static_cast<Sci::Position>(strlen(sText2));
 		bool startSequence = false;
-		const char *cpChange = cb.InsertString(0, sText2, static_cast<int>(sLength), startSequence);
+		const char *cpChange = cb.InsertString(0, sText2, sLength2, startSequence);
 		REQUIRE(startSequence);
 		REQUIRE(sLength2 == cb.Length());
 		REQUIRE(memcmp(cpChange, sText2, sLength2) == 0);
@@ -64,7 +67,7 @@ TEST_CASE("CellBuffer") {
 		REQUIRE(4 == cb.LineStart(1));
 		REQUIRE(1 == cb.LineFromPosition(5));
 		REQUIRE(sLength2 == cb.LineStart(2));
-		REQUIRE(1 == cb.LineFromPosition(static_cast<int>(sLength)));
+		REQUIRE(1 == cb.LineFromPosition(sLength2));
 		REQUIRE(cb.CanUndo());
 		REQUIRE(!cb.CanRedo());
 	}
@@ -74,7 +77,7 @@ TEST_CASE("CellBuffer") {
 		cb.SetUndoCollection(false);
 		REQUIRE(!cb.IsCollectingUndo());
 		bool startSequence = false;
-		const char *cpChange = cb.InsertString(0, sText, static_cast<int>(sLength), startSequence);
+		const char *cpChange = cb.InsertString(0, sText, sLength, startSequence);
 		REQUIRE(!startSequence);
 		REQUIRE(sLength == cb.Length());
 		REQUIRE(memcmp(cpChange, sText, sLength) == 0);
@@ -86,7 +89,7 @@ TEST_CASE("CellBuffer") {
 		const char sTextDeleted[] = "ci";
 		const char sTextAfterDeletion[] = "Sntilla";
 		bool startSequence = false;
-		const char *cpChange = cb.InsertString(0, sText, static_cast<int>(sLength), startSequence);
+		const char *cpChange = cb.InsertString(0, sText, sLength, startSequence);
 		REQUIRE(startSequence);
 		REQUIRE(sLength == cb.Length());
 		REQUIRE(memcmp(cpChange, sText, sLength) == 0);
@@ -146,7 +149,7 @@ TEST_CASE("CellBuffer") {
 		cb.SetReadOnly(true);
 		REQUIRE(cb.IsReadOnly());
 		bool startSequence = false;
-		cb.InsertString(0, sText, static_cast<int>(sLength), startSequence);
+		cb.InsertString(0, sText, sLength, startSequence);
 		REQUIRE(cb.Length() == 0);
 	}
 
@@ -438,3 +441,581 @@ TEST_CASE("CharacterIndex") {
 		REQUIRE(cb.IndexLineStart(3, LineCharacterIndexType::Utf16) == 5);
 	}
 }
+
+TEST_CASE("ChangeHistory") {
+
+	ChangeHistory il;
+	const EditionSet empty;
+	struct Spanner {
+		Sci::Position position = 0;
+		Sci::Position length = 0;
+	};
+
+	SECTION("Start") {
+		REQUIRE(il.Length() == 0);
+		REQUIRE(il.DeletionCount(0,0) == 0);
+		REQUIRE(il.EditionAt(0) == 0);
+		REQUIRE(il.EditionEndRun(0) == 0);
+		REQUIRE(il.EditionDeletesAt(0) == 0);
+		REQUIRE(il.EditionNextDelete(0) == 1);
+	}
+
+	SECTION("Some Space") {
+		il.Insert(0, 10, false, true);
+		REQUIRE(il.Length() == 10);
+		REQUIRE(il.DeletionCount(0,10) == 0);
+		REQUIRE(il.EditionAt(0) == 0);
+		REQUIRE(il.EditionEndRun(0) == 10);
+		REQUIRE(il.EditionDeletesAt(0) == 0);
+		REQUIRE(il.EditionNextDelete(0) == 10);
+		REQUIRE(il.EditionDeletesAt(10) == 0);
+		REQUIRE(il.EditionNextDelete(10) == 11);
+	}
+
+	SECTION("An insert") {
+		il.Insert(0, 7, false, true);
+		il.SetSavePoint();
+		il.Insert(2, 3, true, true);
+		REQUIRE(il.Length() == 10);
+		REQUIRE(il.DeletionCount(0,10) == 0);
+
+		REQUIRE(il.EditionAt(0) == 0);
+		REQUIRE(il.EditionEndRun(0) == 2);
+		REQUIRE(il.EditionAt(2) == 2);
+		REQUIRE(il.EditionEndRun(2) == 5);
+		REQUIRE(il.EditionAt(5) == 0);
+		REQUIRE(il.EditionEndRun(5) == 10);
+		REQUIRE(il.EditionAt(10) == 0);
+
+		REQUIRE(il.EditionDeletesAt(0) == 0);
+		REQUIRE(il.EditionNextDelete(0) == 10);
+		REQUIRE(il.EditionDeletesAt(10) == 0);
+	}
+
+	SECTION("A delete") {
+		il.Insert(0, 10, false, true);
+		il.SetSavePoint();
+		il.DeleteRangeSavingHistory(2, 3, true, false);
+		REQUIRE(il.Length() == 7);
+		REQUIRE(il.DeletionCount(0,7) == 1);
+
+		REQUIRE(il.EditionAt(0) == 0);
+		REQUIRE(il.EditionEndRun(0) == 7);
+		REQUIRE(il.EditionAt(7) == 0);
+
+		REQUIRE(il.EditionDeletesAt(0) == 0);
+		const EditionSet one{ 2 };
+		REQUIRE(il.EditionNextDelete(0) == 2);
+		REQUIRE(il.EditionDeletesAt(2) == 2);
+		REQUIRE(il.EditionNextDelete(2) == 7);
+		REQUIRE(il.EditionDeletesAt(7) == 0);
+	}
+
+	SECTION("Insert, delete, and undo") {
+		il.Insert(0, 9, false, true);
+		il.SetSavePoint();
+		il.Insert(3, 1, true, true);
+		REQUIRE(il.EditionEndRun(0) == 3);
+		REQUIRE(il.EditionAt(3) == 2);
+		REQUIRE(il.EditionEndRun(3) == 4);
+		REQUIRE(il.EditionAt(4) == 0);
+
+		il.DeleteRangeSavingHistory(2, 3, true, false);
+		REQUIRE(il.Length() == 7);
+		REQUIRE(il.DeletionCount(0,7) == 1);
+
+		REQUIRE(il.EditionAt(0) == 0);
+		REQUIRE(il.EditionEndRun(0) == 7);
+		REQUIRE(il.EditionAt(7) == 0);
+
+		REQUIRE(il.EditionDeletesAt(0) == 0);
+		const EditionSet one{ 2 };
+		REQUIRE(il.EditionNextDelete(0) == 2);
+		REQUIRE(il.EditionDeletesAt(2) == 2);
+		REQUIRE(il.EditionNextDelete(2) == 7);
+		REQUIRE(il.EditionDeletesAt(7) == 0);
+
+		// Undo in detail (normally inside CellBuffer::PerformUndoStep)
+		il.UndoDeleteStep(2, 3, false);
+		REQUIRE(il.Length() == 10);
+		REQUIRE(il.DeletionCount(0, 10) == 0);
+		// The insertion has reappeared
+		REQUIRE(il.EditionEndRun(0) == 3);
+		REQUIRE(il.EditionAt(3) == 2);
+		REQUIRE(il.EditionEndRun(3) == 4);
+		REQUIRE(il.EditionAt(4) == 0);
+	}
+
+	SECTION("Deletes") {
+		il.Insert(0, 10, false, true);
+		il.SetSavePoint();
+		il.DeleteRangeSavingHistory(2, 3, true, false);
+		REQUIRE(il.Length() == 7);
+		REQUIRE(il.DeletionCount(0,7) == 1);
+
+		REQUIRE(il.EditionDeletesAt(0) == 0);
+		REQUIRE(il.EditionNextDelete(0) == 2);
+		REQUIRE(il.EditionDeletesAt(2) == 2);
+		REQUIRE(il.EditionNextDelete(2) == 7);
+		REQUIRE(il.EditionDeletesAt(7) == 0);
+
+		il.DeleteRangeSavingHistory(2, 1, true, false);
+		REQUIRE(il.Length() == 6);
+		REQUIRE(il.DeletionCount(0,6) == 2);
+
+		REQUIRE(il.EditionDeletesAt(0) == 0);
+		REQUIRE(il.EditionNextDelete(0) == 2);
+		REQUIRE(il.EditionDeletesAt(2) == 2);
+		REQUIRE(il.EditionNextDelete(2) == 6);
+		REQUIRE(il.EditionDeletesAt(6) == 0);
+
+		// Undo in detail (normally inside CellBuffer::PerformUndoStep)
+		il.UndoDeleteStep(2, 1, false);
+		REQUIRE(il.Length() == 7);
+		REQUIRE(il.DeletionCount(0, 7) == 1);
+
+		// Undo in detail (normally inside CellBuffer::PerformUndoStep)
+		il.UndoDeleteStep(2, 3, false);
+		REQUIRE(il.Length() == 10);
+		REQUIRE(il.DeletionCount(0, 10) == 0);
+	}
+
+	SECTION("Deletes 101") {
+		// Deletes that hit the start and end permanent positions
+		il.Insert(0, 3, false, true);
+		il.SetSavePoint();
+		REQUIRE(il.DeletionCount(0, 2) == 0);
+		il.DeleteRangeSavingHistory(1, 1, true, false);
+		REQUIRE(il.DeletionCount(0,2) == 1);
+		const EditionSet at1 = {2};
+		REQUIRE(il.DeletionsAt(1) == at1);
+		il.DeleteRangeSavingHistory(1, 1, false, false);
+		REQUIRE(il.DeletionCount(0,1) == 2);
+		const EditionSet at2 = { 2, 3 };
+		REQUIRE(il.DeletionsAt(1) == at2);
+		il.DeleteRangeSavingHistory(0, 1, false, false);
+		const EditionSet at3 = { 2, 3, 3 };
+		REQUIRE(il.DeletionsAt(0) == at3);
+		REQUIRE(il.DeletionCount(0,0) == 3);
+
+		// Undo them
+		il.UndoDeleteStep(0, 1, false);
+		REQUIRE(il.DeletionCount(0, 1) == 2);
+		REQUIRE(il.DeletionsAt(1) == at2);
+		il.UndoDeleteStep(1, 1, false);
+		REQUIRE(il.DeletionCount(0, 2) == 1);
+		REQUIRE(il.DeletionsAt(1) == at1);
+		il.UndoDeleteStep(1, 1, false);
+		REQUIRE(il.DeletionCount(0, 3) == 0);
+	}
+
+	SECTION("Deletes Stack") {
+		std::vector<Spanner> spans = {
+			{5, 1},
+			{4, 3},
+			{1, 1},
+			{1, 1},
+			{0, 1},
+			{0, 3},
+		};
+
+		// Deletes that hit the start and end permanent positions
+		il.Insert(0, 10, false, true);
+		REQUIRE(il.Length() == 10);
+		il.SetSavePoint();
+		REQUIRE(il.DeletionCount(0, 10) == 0);
+		for (size_t i = 0; i < std::size(spans); i++) {
+			il.DeleteRangeSavingHistory(spans[i].position, spans[i].length, false, false);
+		}
+		REQUIRE(il.Length() == 0);
+		for (size_t j = 0; j < std::size(spans); j++) {
+			const size_t i = std::size(spans) - j - 1;
+			il.UndoDeleteStep(spans[i].position, spans[i].length, false);
+		}
+		REQUIRE(il.DeletionCount(0, 10) == 0);
+		REQUIRE(il.Length() == 10);
+	}
+}
+
+struct InsertionResult {
+	Sci::Position position;
+	Sci::Position length;
+	int state;
+	bool operator==(const InsertionResult &other) const noexcept {
+		return position == other.position &&
+			length == other.length &&
+			state == other.state;
+	}
+};
+
+std::ostream &operator << (std::ostream &os, InsertionResult const &value) {
+	os << value.position << " " << value.length << " " << value.state;
+	return os;
+}
+
+using Insertions = std::vector<InsertionResult>;
+
+std::ostream &operator << (std::ostream &os, Insertions const &value) {
+	os << "(";
+	for (const InsertionResult &el : value) {
+		os << "(" << el << ") ";
+	}
+	os << ")";
+	return os;
+}
+
+Insertions HistoryInsertions(const CellBuffer &cb) {
+	Insertions result;
+	Sci::Position startPos = 0;
+	while (startPos < cb.Length()) {
+		const Sci::Position endPos = cb.EditionEndRun(startPos);
+		const int ed = cb.EditionAt(startPos);
+		if (ed) {
+			result.push_back({ startPos, endPos - startPos, ed });
+		}
+		startPos = endPos;
+	}
+	return result;
+}
+
+struct DeletionResult {
+	Sci::Position position;
+	int state;
+	bool operator==(const DeletionResult &other) const noexcept {
+		return position == other.position &&
+			state == other.state;
+	}
+};
+
+std::ostream &operator << (std::ostream &os, DeletionResult const &value) {
+	os << value.position << " " << value.state;
+	return os;
+}
+
+using Deletions = std::vector<DeletionResult>;
+
+std::ostream &operator << (std::ostream &os, Deletions const &value) {
+	os << "(";
+	for (const DeletionResult &el : value) {
+		os << "(" << el << ") ";
+	}
+	os << ")";
+	return os;
+}
+
+Deletions HistoryDeletions(const CellBuffer &cb) {
+	Deletions result;
+	Sci::Position positionDeletion = 0;
+	while (positionDeletion <= cb.Length()) {
+		const unsigned int editions = cb.EditionDeletesAt(positionDeletion);
+		if (editions & 1) {
+			result.push_back({ positionDeletion, 1 });
+		}
+		if (editions & 2) {
+			result.push_back({ positionDeletion, 2 });
+		}
+		if (editions & 4) {
+			result.push_back({ positionDeletion, 3 });
+		}
+		if (editions & 8) {
+			result.push_back({ positionDeletion, 4 });
+		}
+		positionDeletion = cb.EditionNextDelete(positionDeletion);
+	}
+	return result;
+}
+
+struct History {
+	Insertions insertions;
+	Deletions deletions;
+	bool operator==(const History &other) const {
+		return insertions == other.insertions &&
+			deletions == other.deletions;
+	}
+};
+
+std::ostream &operator << (std::ostream &os, History const &value) {
+	os << value.insertions << " " << value.deletions;
+	return os;
+}
+
+History HistoryOf(const CellBuffer &cb) {
+	return { HistoryInsertions(cb), HistoryDeletions(cb) };
+}
+
+void UndoBlock(CellBuffer &cb) {
+	const int steps = cb.StartUndo();
+	for (int step = 0; step < steps; step++) {
+		cb.PerformUndoStep();
+	}
+}
+
+void RedoBlock(CellBuffer &cb) {
+	const int steps = cb.StartRedo();
+	for (int step = 0; step < steps; step++) {
+		cb.PerformRedoStep();
+	}
+}
+
+TEST_CASE("CellBufferWithChangeHistory") {
+
+	SECTION("StraightUndoRedoSaveRevertRedo") {
+		CellBuffer cb(true, false);
+		cb.SetUndoCollection(false);
+		std::string sInsert = "abcdefghijklmnopqrstuvwxyz";
+		bool startSequence = false;
+		cb.InsertString(0, sInsert.c_str(), sInsert.length(), startSequence);
+		cb.SetUndoCollection(true);
+		cb.SetSavePoint();
+		cb.ChangeHistorySet(true);
+
+		const History history0 { {}, {} };
+		REQUIRE(HistoryOf(cb) == history0);
+
+		// 1
+		cb.InsertString(4, "_", 1, startSequence);
+		const History history1{ {{4, 1, 3}}, {} };
+		REQUIRE(HistoryOf(cb) == history1);
+
+		// 2
+		cb.DeleteChars(2, 1, startSequence);
+		const History history2{ {{3, 1, 3}},
+			{{2, 3}} };
+		REQUIRE(HistoryOf(cb) == history2);
+
+		// 3
+		cb.InsertString(1, "[!]", 3, startSequence);
+		const History history3{ { {1, 3, 3}, {6, 1, 3} },
+			{ {5, 3} } };
+		REQUIRE(HistoryOf(cb) == history3);
+
+		// 4
+		cb.DeleteChars(2, 1, startSequence);	// Inside an insertion
+		const History history4{ { {1, 2, 3}, {5, 1, 3} },
+			{ {2, 3}, {4, 3} }};
+		REQUIRE(HistoryOf(cb) == history4);
+
+		// 5 Delete all the insertions and deletions
+		cb.DeleteChars(1, 6, startSequence);	// Inside an insertion
+		const History history5{ { },
+			{ {1, 3} } };
+		REQUIRE(HistoryOf(cb) == history5);
+
+		// Undo all
+		UndoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history4);
+
+		UndoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history3);
+
+		UndoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history2);
+
+		UndoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history1);
+
+		UndoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history0);
+
+		// Redo all
+		RedoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history1);
+
+		RedoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history2);
+
+		RedoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history3);
+
+		RedoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history4);
+
+		RedoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history5);
+
+		cb.SetSavePoint();
+		const History history5s{ { },
+			{ {1, 2} } };
+		REQUIRE(HistoryOf(cb) == history5s);
+
+		// Change past save point
+		cb.InsertString(4, "123", 3, startSequence);
+		const History history6{ { {4, 3, 3} },
+			{ {1, 2} } };
+		REQUIRE(HistoryOf(cb) == history6);
+
+		// Undo to save point: same as 5 but with save state instead of unsaved
+		UndoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history5s);
+
+		// Reverting past save point, similar to 4 but with most saved and
+		// reverted delete at 1
+		UndoBlock(cb);	// Reinsert most of original changes
+		const History history4s{ { {1, 2, 4}, {3, 2, 1}, {5, 1, 4}, {6, 1, 1} },
+			{ {2, 2}, {4, 2} } };
+		REQUIRE(HistoryOf(cb) == history4s);
+
+		UndoBlock(cb);	// Reinsert "!", 
+		const History history3s{ { {1, 3, 4}, {4, 2, 1}, {6, 1, 4}, {7, 1, 1} },
+			{ {5, 2} } };
+		REQUIRE(HistoryOf(cb) == history3s);
+
+		UndoBlock(cb);	// Revert insertion of [!]
+		const History history2s{ { {1, 2, 1}, {3, 1, 4}, {4, 1, 1} },
+			{ {1, 1}, {2, 2} } };
+		REQUIRE(HistoryOf(cb) == history2s);
+
+		UndoBlock(cb);	// Revert deletion, inserts at 2
+		const History history1s{ { {1, 3, 1}, {4, 1, 4}, {5, 1, 1} },
+			{ {1, 1} } };
+		REQUIRE(HistoryOf(cb) == history1s);
+
+		UndoBlock(cb);	// Revert insertion of _ at 4, drops middle insertion run
+		// So merges down to 1 insertion
+		const History history0s{ { {1, 4, 1} },
+			{ {1, 1}, {4, 1} } };
+		REQUIRE(HistoryOf(cb) == history0s);
+
+		// At origin but with changes from disk
+		// Now redo the steps
+
+		RedoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history1s);
+
+		RedoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history2s);
+
+		RedoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history3s);
+
+		RedoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history4s);
+
+		RedoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history5s);
+
+		RedoBlock(cb);
+		REQUIRE(HistoryOf(cb) == history6);
+	}
+
+	SECTION("Detached") {
+		CellBuffer cb(true, false);
+		cb.SetUndoCollection(false);
+		std::string sInsert = "abcdefghijklmnopqrstuvwxyz";
+		bool startSequence = false;
+		cb.InsertString(0, sInsert.c_str(), sInsert.length(), startSequence);
+		cb.SetUndoCollection(true);
+		cb.SetSavePoint();
+		cb.ChangeHistorySet(true);
+
+		const History history0{ {}, {} };
+		REQUIRE(HistoryOf(cb) == history0);
+
+		// 1
+		cb.InsertString(4, "_", 1, startSequence);
+		const History history1{ {{4, 1, 3}}, {} };
+		REQUIRE(HistoryOf(cb) == history1);
+
+		// 2
+		cb.DeleteChars(2, 1, startSequence);
+		const History history2{ {{3, 1, 3}},
+			{{2, 3}} };
+		REQUIRE(HistoryOf(cb) == history2);
+
+		cb.SetSavePoint();
+
+		UndoBlock(cb);
+		const History history1s{ {{2, 1, 1}, {4, 1, 2}}, {} };
+		REQUIRE(HistoryOf(cb) == history1s);
+
+		cb.InsertString(6, "()", 2, startSequence);
+		const History detached2{ {{2, 1, 1}, {4, 1, 2}, {6, 2, 3}}, {} };
+		REQUIRE(HistoryOf(cb) == detached2);
+
+		cb.DeleteChars(9, 3, startSequence);
+		const History detached3{ {{2, 1, 1}, {4, 1, 2}, {6, 2, 3}}, {{9,3}} };
+		REQUIRE(HistoryOf(cb) == detached3);
+
+		UndoBlock(cb);
+		REQUIRE(HistoryOf(cb) == detached2);
+		UndoBlock(cb);
+		const History detached1{ {{2, 1, 1}, {4, 1, 2}}, {} };
+		REQUIRE(HistoryOf(cb) == detached1);
+		UndoBlock(cb);
+		const History detached0{ {{2, 1, 1}}, {{4,1}} };
+		REQUIRE(HistoryOf(cb) == detached0);
+		REQUIRE(!cb.CanUndo());
+
+		RedoBlock(cb);
+		REQUIRE(HistoryOf(cb) == detached1);
+		RedoBlock(cb);
+		REQUIRE(HistoryOf(cb) == detached2);
+		RedoBlock(cb);
+		REQUIRE(HistoryOf(cb) == detached3);
+	}
+}
+
+namespace {
+
+// Implement low quality reproducible pseudo-random numbers.
+// Pseudo-random algorithm based on R. G. Dromey "How to Solve it by Computer" page 122.
+
+class RandomSequence {
+	static constexpr int mult = 109;
+	static constexpr int incr = 853;
+	static constexpr int modulus = 4096;
+	int randomValue = 127;
+public:
+	int Next() noexcept {
+		randomValue = (mult * randomValue + incr) % modulus;
+		return randomValue;
+	}
+};
+
+}
+
+#if 1
+TEST_CASE("CellBufferLong") {
+
+	// Call methods on CellBuffer pseudo-randomly trying  to trigger assertion failures
+
+	CellBuffer cb(true, false);
+
+	SECTION("Random") {
+		RandomSequence rseq;
+		for (size_t i = 0l; i < 20000; i++) {
+			const int r = rseq.Next() % 10;
+			if (r <= 2) {			// 30%
+				// Insert text
+				const int pos = rseq.Next() % (cb.Length() + 1);
+				const int len = rseq.Next() % 10 + 1;
+				std::string sInsert;
+				for (int j = 0; j < len; j++) {
+					sInsert.push_back(static_cast<char>('a' + j));
+				}
+				bool startSequence = false;
+				cb.InsertString(pos, sInsert.c_str(), len, startSequence);
+			} else if (r <= 5) {	// 30%
+				// Delete Text
+				const Sci::Position pos = rseq.Next() % (cb.Length() + 1);
+				const int len = rseq.Next() % 10 + 1;
+				if (pos + len <= cb.Length()) {
+					bool startSequence = false;
+					cb.DeleteChars(pos, len, startSequence);
+				}
+			} else if (r <= 8) {	// 30%
+				// Undo or redo
+				const bool undo = rseq.Next() % 2 == 1;
+				if (undo) {
+					UndoBlock(cb);
+				} else {
+					RedoBlock(cb);
+				}
+			} else {	// 10%
+				// Save
+				cb.SetSavePoint();
+			}
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/scintilla/test/unit/testContractionState.cxx b/scintilla/test/unit/testContractionState.cxx
index e5b9045a5..c199b6332 100644
--- a/scintilla/test/unit/testContractionState.cxx
+++ b/scintilla/test/unit/testContractionState.cxx
@@ -152,6 +152,28 @@ TEST_CASE("ContractionState") {
 		REQUIRE(true == pcs->GetExpanded(3));
 	}
 
+	SECTION("ExpandAll") {
+		pcs->InsertLines(0,4);
+		for (int l=0;l<4;l++) {
+			REQUIRE(true == pcs->GetExpanded(l));
+		}
+
+		pcs->SetExpanded(2, false);
+		REQUIRE(true == pcs->GetExpanded(1));
+		REQUIRE(false == pcs->GetExpanded(2));
+		REQUIRE(true == pcs->GetExpanded(3));
+
+		pcs->SetExpanded(1, false);
+		REQUIRE(false == pcs->GetExpanded(1));
+		REQUIRE(false == pcs->GetExpanded(2));
+		REQUIRE(true == pcs->GetExpanded(3));
+
+		REQUIRE(true == pcs->ExpandAll());
+		REQUIRE(true == pcs->GetExpanded(1));
+		REQUIRE(true == pcs->GetExpanded(2));
+		REQUIRE(true == pcs->GetExpanded(3));
+	}
+
 	SECTION("ChangeHeight") {
 		pcs->InsertLines(0,4);
 		for (int l=0;l<4;l++) {
diff --git a/scintilla/test/unit/testDocument.cxx b/scintilla/test/unit/testDocument.cxx
index 7f3d9c6bb..3cfb54db4 100644
--- a/scintilla/test/unit/testDocument.cxx
+++ b/scintilla/test/unit/testDocument.cxx
@@ -7,6 +7,7 @@
 #include <stdexcept>
 #include <string_view>
 #include <vector>
+#include <set>
 #include <optional>
 #include <algorithm>
 #include <memory>
@@ -601,3 +602,72 @@ TEST_CASE("SafeSegment") {
 		REQUIRE(text[length] == '\x8c');
 	}
 }
+
+TEST_CASE("PerLine") {
+	SECTION("LineMarkers") {
+		DocPlus doc("1\n2\n", CpUtf8);
+		REQUIRE(doc.document.LinesTotal() == 3);
+		const int mh1 = doc.document.AddMark(0, 0);
+		const int mh2 = doc.document.AddMark(1, 1);
+		const int mh3 = doc.document.AddMark(2, 2);
+		REQUIRE(mh1 != -1);
+		REQUIRE(mh2 != -1);
+		REQUIRE(mh3 != -1);
+		REQUIRE(doc.document.AddMark(3, 3) == -1);
+
+		// delete first character, no change
+		REQUIRE(doc.document.CharAt(0) == '1');
+		doc.document.DeleteChars(0, 1);
+		REQUIRE(doc.document.LinesTotal() == 3);
+		REQUIRE(doc.document.MarkerHandleFromLine(0, 0) == mh1);
+		REQUIRE(doc.document.MarkerHandleFromLine(0, 1) == -1);
+		REQUIRE(doc.document.MarkerHandleFromLine(1, 0) == mh2);
+		REQUIRE(doc.document.MarkerHandleFromLine(1, 1) == -1);
+
+		// delete first line, so merged
+		REQUIRE(doc.document.CharAt(0) == '\n');
+		doc.document.DeleteChars(0, 1);
+		REQUIRE(doc.document.CharAt(0) == '2');
+		const std::set handleSet {mh1, mh2};
+		const int handle1 = doc.document.MarkerHandleFromLine(0, 0);
+		const int handle2 = doc.document.MarkerHandleFromLine(0, 1);
+		REQUIRE(handle1 != handle2);
+		REQUIRE(handleSet.count(handle1) == 1);
+		REQUIRE(handleSet.count(handle2) == 1);
+		REQUIRE(doc.document.MarkerHandleFromLine(0, 2) == -1);
+		REQUIRE(doc.document.MarkerHandleFromLine(1, 0) == mh3);
+		REQUIRE(doc.document.MarkerHandleFromLine(1, 1) == -1);
+	}
+
+	SECTION("LineAnnotation") {
+		DocPlus doc("1\n2\n", CpUtf8);
+		REQUIRE(doc.document.LinesTotal() == 3);
+		Sci::Position length = doc.document.Length();
+		doc.document.AnnotationSetText(0, "1");
+		doc.document.AnnotationSetText(1, "1\n2");
+		doc.document.AnnotationSetText(2, "1\n2\n3");
+		REQUIRE(doc.document.AnnotationLines(0) == 1);
+		REQUIRE(doc.document.AnnotationLines(1) == 2);
+		REQUIRE(doc.document.AnnotationLines(2) == 3);
+		REQUIRE(doc.document.AnnotationLines(3) == 0);
+
+		// delete last line
+		length -= 1;
+		doc.document.DeleteChars(length, 1);
+		// Deleting the last line moves its 3-line annotation to previous line,
+		// deleting the 2-line annotation of the previous line.
+		REQUIRE(doc.document.LinesTotal() == 2);
+		REQUIRE(doc.document.AnnotationLines(0) == 1);
+		REQUIRE(doc.document.AnnotationLines(1) == 3);
+		REQUIRE(doc.document.AnnotationLines(2) == 0);
+
+		// delete last character, no change
+		length -= 1;
+		REQUIRE(doc.document.CharAt(length) == '2');
+		doc.document.DeleteChars(length, 1);
+		REQUIRE(doc.document.LinesTotal() == 2);
+		REQUIRE(doc.document.AnnotationLines(0) == 1);
+		REQUIRE(doc.document.AnnotationLines(1) == 3);
+		REQUIRE(doc.document.AnnotationLines(2) == 0);
+	}
+}
diff --git a/scintilla/test/unit/testPartitioning.cxx b/scintilla/test/unit/testPartitioning.cxx
index 6e9943b50..356d0efb2 100644
--- a/scintilla/test/unit/testPartitioning.cxx
+++ b/scintilla/test/unit/testPartitioning.cxx
@@ -22,39 +22,38 @@
 
 using namespace Scintilla::Internal;
 
-constexpr int growSize = 4;
-
 constexpr int lengthTestArray = 8;
 static const int testArray[lengthTestArray] = {3, 4, 5, 6, 7, 8, 9, 10};
 
-// Test SplitVectorWithRangeAdd.
+// Test Partitioning.
 
-TEST_CASE("SplitVectorWithRangeAdd") {
+TEST_CASE("CompileCopying Partitioning") {
 
-	SplitVectorWithRangeAdd<int> svwra(growSize);
+	// These are compile-time tests to check that basic copy and move
+	// operations are defined correctly.
 
-	SECTION("IsEmptyInitially") {
-		REQUIRE(0 == svwra.Length());
-	}
+	SECTION("CopyingMoving") {
+		Partitioning<int> s;
+		Partitioning<int> s2;
 
-	SECTION("IncrementExceptEnds") {
-		svwra.InsertFromArray(0, testArray, 0, lengthTestArray);
-		svwra.RangeAddDelta(1, lengthTestArray-1, 1);
-		for (int i=0; i<svwra.Length(); i++) {
-			if ((i == 0) || (i == lengthTestArray-1))
-				REQUIRE((i+3) == svwra.ValueAt(i));
-			else
-				REQUIRE((i+4) == svwra.ValueAt(i));
-		}
+		// Copy constructor
+		Partitioning<int> sa(s);
+		// Copy assignment
+		Partitioning<int> sb;
+		sb = s;
+
+		// Move constructor
+		Partitioning<int> sc(std::move(s));
+		// Move assignment
+		Partitioning<int> sd;
+		sd = (std::move(s2));
 	}
 
 }
 
-// Test Partitioning.
-
 TEST_CASE("Partitioning") {
 
-	Partitioning<Sci::Position> part(growSize);
+	Partitioning<Sci::Position> part;
 
 	SECTION("IsEmptyInitially") {
 		REQUIRE(1 == part.Partitions());
@@ -85,6 +84,7 @@ TEST_CASE("Partitioning") {
 		REQUIRE(0 == part.PositionFromPartition(0));
 		REQUIRE(1 == part.PositionFromPartition(1));
 		REQUIRE(3 == part.PositionFromPartition(2));
+		part.Check();
 	}
 
 	SECTION("InsertAgain") {
@@ -96,6 +96,7 @@ TEST_CASE("Partitioning") {
 		REQUIRE(0 == part.PositionFromPartition(0));
 		REQUIRE(5 == part.PositionFromPartition(1));
 		REQUIRE(8 == part.PositionFromPartition(2));
+		part.Check();
 	}
 
 	SECTION("InsertMultiple") {
@@ -108,6 +109,7 @@ TEST_CASE("Partitioning") {
 		REQUIRE(5 == part.PositionFromPartition(2));
 		REQUIRE(7 == part.PositionFromPartition(3));
 		REQUIRE(10 == part.PositionFromPartition(4));
+		part.Check();
 	}
 
 	SECTION("InsertMultipleWithCast") {
@@ -122,6 +124,7 @@ TEST_CASE("Partitioning") {
 		REQUIRE(6 == part.PositionFromPartition(3));
 		REQUIRE(8 == part.PositionFromPartition(4));
 		REQUIRE(9 == part.PositionFromPartition(5));
+		part.Check();
 	}
 
 	SECTION("InsertReversed") {
@@ -133,6 +136,7 @@ TEST_CASE("Partitioning") {
 		REQUIRE(0 == part.PositionFromPartition(0));
 		REQUIRE(5 == part.PositionFromPartition(1));
 		REQUIRE(8 == part.PositionFromPartition(2));
+		part.Check();
 	}
 
 	SECTION("InverseSearch") {
@@ -150,6 +154,7 @@ TEST_CASE("Partitioning") {
 		REQUIRE(1 == part.PartitionFromPosition(2));
 
 		REQUIRE(1 == part.PartitionFromPosition(3));
+		part.Check();
 	}
 
 	SECTION("DeletePartition") {
@@ -159,6 +164,7 @@ TEST_CASE("Partitioning") {
 		REQUIRE(1 == part.Partitions());
 		REQUIRE(0 == part.PositionFromPartition(0));
 		REQUIRE(2 == part.PositionFromPartition(1));
+		part.Check();
 	}
 
 	SECTION("DeleteAll") {
@@ -185,6 +191,7 @@ TEST_CASE("Partitioning") {
 		REQUIRE(11 == part.PositionFromPartition(2));
 		REQUIRE(18 == part.PositionFromPartition(3));
 		REQUIRE(19 == part.PositionFromPartition(4));
+		part.Check();
 	}
 
 	SECTION("TestMany") {
@@ -214,6 +221,7 @@ TEST_CASE("Partitioning") {
 		REQUIRE(10 == part.PartitionFromPosition(46));
 		REQUIRE(50 == part.PositionFromPartition(11));
 		REQUIRE(11 == part.PartitionFromPosition(50));
+		part.Check();
 	}
 
 }
diff --git a/scintilla/test/unit/testPerLine.cxx b/scintilla/test/unit/testPerLine.cxx
index 5209c194e..d9cf11ac6 100644
--- a/scintilla/test/unit/testPerLine.cxx
+++ b/scintilla/test/unit/testPerLine.cxx
@@ -31,6 +31,30 @@ constexpr int FoldBase = static_cast<int>(Scintilla::FoldLevel::Base);
 
 // Test MarkerHandleSet.
 
+TEST_CASE("CompileCopying MarkerHandleSet") {
+
+	// These are compile-time tests to check that basic copy and move
+	// operations are defined correctly.
+
+	SECTION("CopyingMoving") {
+		MarkerHandleSet s;
+		MarkerHandleSet s2;
+
+		// Copy constructor
+		MarkerHandleSet sa(s);
+		// Copy assignment
+		MarkerHandleSet sb;
+		sb = s;
+
+		// Move constructor
+		MarkerHandleSet sc(std::move(s));
+		// Move assignment
+		MarkerHandleSet sd;
+		sd = (std::move(s2));
+	}
+
+}
+
 TEST_CASE("MarkerHandleSet") {
 
 	MarkerHandleSet mhs;
@@ -226,11 +250,11 @@ TEST_CASE("LineState") {
 	}
 
 	SECTION("SetLineState") {
-		REQUIRE(0 == ls.SetLineState(1, 200));
+		REQUIRE(0 == ls.SetLineState(1, 200, 2));
 		REQUIRE(0 == ls.GetLineState(0));
 		REQUIRE(200 == ls.GetLineState(1));
 		REQUIRE(0 == ls.GetLineState(2));
-		REQUIRE(0 == ls.SetLineState(2, 400));
+		REQUIRE(0 == ls.SetLineState(2, 400, 3));
 		REQUIRE(0 == ls.GetLineState(0));
 		REQUIRE(200 == ls.GetLineState(1));
 		REQUIRE(400 == ls.GetLineState(2));
@@ -244,11 +268,11 @@ TEST_CASE("LineState") {
 
 	SECTION("InsertRemoveLine") {
 		REQUIRE(0 == ls.GetMaxLineState());
-		ls.SetLineState(1, 1);
-		ls.SetLineState(2, 2);
-		REQUIRE(3 == ls.GetMaxLineState());
-		ls.InsertLine(2);
+		ls.SetLineState(1, 1, 3);
+		ls.SetLineState(2, 2, 3);
 		REQUIRE(4 == ls.GetMaxLineState());
+		ls.InsertLine(2);
+		REQUIRE(5 == ls.GetMaxLineState());
 		REQUIRE(0 == ls.GetLineState(0));
 		REQUIRE(1 == ls.GetLineState(1));
 		REQUIRE(2 == ls.GetLineState(2));
diff --git a/scintilla/test/unit/testRunStyles.cxx b/scintilla/test/unit/testRunStyles.cxx
index 2da8e78d8..6c2dffd62 100644
--- a/scintilla/test/unit/testRunStyles.cxx
+++ b/scintilla/test/unit/testRunStyles.cxx
@@ -25,6 +25,52 @@ using namespace Scintilla::Internal;
 
 // Test RunStyles.
 
+using UniqueInt = std::unique_ptr<int>;
+
+TEST_CASE("CompileCopying RunStyles") {
+
+	// These are compile-time tests to check that basic copy and move
+	// operations are defined correctly.
+
+	SECTION("CopyingMoving") {
+		RunStyles<int, int> s;
+		RunStyles<int, int> s2;
+
+		// Copy constructor
+		RunStyles<int, int> sa(s);
+		// Copy assignment fails
+		RunStyles<int, int> sb;
+		sb = s;
+
+		// Move constructor
+		RunStyles<int, int> sc(std::move(s));
+		// Move assignment
+		RunStyles<int, int> sd;
+		sd = (std::move(s2));
+	}
+
+#if defined(SHOW_COPY_BUILD_FAILURES)
+	// It should be reasonable to instantiate RunStyles where STYLE is move-only but fails
+	SECTION("MoveOnly") {
+		RunStyles<int, UniqueInt> s;
+
+		// Copy is not defined for std::unique_ptr
+		// Copy constructor fails
+		RunStyles<int, UniqueInt> sa(s);
+		// Copy assignment fails
+		RunStyles<int, UniqueInt> sb;
+		sb = s;
+
+		// Move constructor fails
+		RunStyles<int, UniqueInt> sc(std::move(s));
+		// Move assignment fails
+		RunStyles<int, UniqueInt> sd;
+		sd = (std::move(s));
+	}
+#endif
+
+}
+
 namespace Scintilla::Internal {	// Xcode clang 9.0 doesn't like this when in the unnamed namespace
 	bool operator==(const FillResult<int> &fra, const FillResult<int> &frb) {
 		return fra.changed == frb.changed &&
diff --git a/scintilla/test/unit/testSparseVector.cxx b/scintilla/test/unit/testSparseVector.cxx
index 0bc8f9093..3a784d4c2 100644
--- a/scintilla/test/unit/testSparseVector.cxx
+++ b/scintilla/test/unit/testSparseVector.cxx
@@ -27,6 +27,51 @@ using namespace Scintilla::Internal;
 
 // Test SparseVector.
 
+using UniqueInt = std::unique_ptr<int>;
+
+TEST_CASE("CompileCopying SparseVector") {
+
+	// These are compile-time tests to check that basic copy and move
+	// operations are defined correctly.
+
+	SECTION("CopyingMoving") {
+		SparseVector<int> s;
+		SparseVector<int> s2;
+
+		// Copy constructor
+		SparseVector<int> sa(s);
+		// Copy assignment
+		SparseVector<int> sb;
+		sb = s;
+
+		// Move constructor
+		SparseVector<int> sc(std::move(s));
+		// Move assignment
+		SparseVector<int> sd;
+		sd = (std::move(s2));
+	}
+
+	SECTION("MoveOnly") {
+		SparseVector<UniqueInt> s;
+
+#if defined(SHOW_COPY_BUILD_FAILURES)
+		// Copy is not defined for std::unique_ptr
+		// Copy constructor fails
+		SparseVector<UniqueInt> sa(s);
+		// Copy assignment fails
+		SparseVector<UniqueInt> sb;
+		sb = s;
+#endif
+
+		// Move constructor
+		SparseVector<UniqueInt> sc(std::move(s));
+		// Move assignment
+		SparseVector<UniqueInt> sd;
+		sd = (std::move(s));
+	}
+
+}
+
 // Helper to produce a string representation of a SparseVector<const char *>
 // to simplify checks.
 static std::string Representation(const SparseVector<UniqueString> &st) {
@@ -179,6 +224,10 @@ TEST_CASE("SparseVector") {
 		REQUIRE(1 == st.Elements());
 		REQUIRE("------" == Representation(st));
 		st.Check();
+		st.SetValueAt(5, nullptr);
+		REQUIRE(1 == st.Elements());
+		REQUIRE("------" == Representation(st));
+		st.Check();
 	}
 
 	SECTION("CheckDeletionLeavesOrdered") {
@@ -206,6 +255,9 @@ TEST_CASE("SparseVector") {
 		st.SetValueAt(3, UniqueStringCopy("3"));
 		REQUIRE(5 == st.Elements());
 		REQUIRE("---34--7-9-" == Representation(st));
+		st.DeleteAll();
+		REQUIRE(1 == st.Elements());
+		REQUIRE("-" == Representation(st));
 		st.Check();
 	}
 
@@ -374,6 +426,21 @@ TEST_CASE("SparseTextInt") {
 		REQUIRE(3 == st.PositionOfElement(1));
 		REQUIRE(2 == st.IndexAfter(3));
 		REQUIRE(5 == st.PositionOfElement(2));
+		REQUIRE(2 == st.IndexAfter(4));
+	}
+
+	SECTION("PositionNext") {
+		st.InsertSpace(0, 5);
+		REQUIRE(1 == st.Elements());
+		REQUIRE(5 == st.PositionNext(-1));
+		REQUIRE(5 == st.PositionNext(0));
+		REQUIRE(6 == st.PositionNext(5));
+		st.SetValueAt(3, 3);
+		REQUIRE(2 == st.Elements());
+		REQUIRE(3 == st.PositionNext(-1));
+		REQUIRE(3 == st.PositionNext(0));
+		REQUIRE(5 == st.PositionNext(3));
+		REQUIRE(6 == st.PositionNext(5));
 	}
 }
 
diff --git a/scintilla/test/unit/testSplitVector.cxx b/scintilla/test/unit/testSplitVector.cxx
index 07b0a0ba8..543c40b3f 100644
--- a/scintilla/test/unit/testSplitVector.cxx
+++ b/scintilla/test/unit/testSplitVector.cxx
@@ -23,6 +23,53 @@ using namespace Scintilla::Internal;
 
 // Test SplitVector.
 
+using UniqueInt = std::unique_ptr<int>;
+
+// Test SplitVector.
+
+TEST_CASE("CompileCopying SplitVector") {
+
+	// These are compile-time tests to check that basic copy and move
+	// operations are defined correctly.
+
+	SECTION("CopyingMoving") {
+		SplitVector<int> s;
+		SplitVector<int> s2;
+
+		// Copy constructor fails
+		SplitVector<int> sa(s);
+		// Copy assignment fails
+		SplitVector<int> sb;
+		sb = s;
+
+		// Move constructor fails
+		SplitVector<int> sc(std::move(s));
+		// Move assignment fails
+		SplitVector<int> sd;
+		sd = (std::move(s2));
+	}
+
+	SECTION("MoveOnly") {
+		SplitVector<UniqueInt> s;
+
+#if defined(SHOW_COPY_BUILD_FAILURES)
+		// Copy is not defined for std::unique_ptr
+		// Copy constructor fails
+		SplitVector<UniqueInt> sa(s);
+		// Copy assignment fails
+		SplitVector<UniqueInt> sb;
+		sb = s;
+#endif
+
+		// Move constructor fails
+		SplitVector<UniqueInt> sc(std::move(s));
+		// Move assignment fails
+		SplitVector<UniqueInt> sd;
+		sd = (std::move(s));
+	}
+
+}
+
 struct StringSetHolder {
 	SplitVector<std::string> sa;
 	bool Check() const noexcept {
diff --git a/scintilla/version.txt b/scintilla/version.txt
index 89ba552a5..7156c8670 100644
--- a/scintilla/version.txt
+++ b/scintilla/version.txt
@@ -1 +1 @@
-524
+530
diff --git a/scintilla/win32/PlatWin.cxx b/scintilla/win32/PlatWin.cxx
index 2cb20cc16..de4648761 100644
--- a/scintilla/win32/PlatWin.cxx
+++ b/scintilla/win32/PlatWin.cxx
@@ -1651,17 +1651,27 @@ void SurfaceD2D::FillRectangle(PRectangle rc, Surface &surfacePattern) {
 
 void SurfaceD2D::RoundedRectangle(PRectangle rc, FillStroke fillStroke) {
 	if (pRenderTarget) {
-		D2D1_ROUNDED_RECT roundedRectFill = {
-			RectangleFromPRectangle(rc.Inset(1.0)),
-			4, 4};
-		D2DPenColourAlpha(fillStroke.fill.colour);
-		pRenderTarget->FillRoundedRectangle(roundedRectFill, pBrush);
+		const FLOAT minDimension = static_cast<FLOAT>(std::min(rc.Width(), rc.Height())) / 2.0f;
+		const FLOAT radius = std::min(4.0f, minDimension);
+		if (fillStroke.fill.colour == fillStroke.stroke.colour) {
+			D2D1_ROUNDED_RECT roundedRectFill = {
+				RectangleFromPRectangle(rc),
+				radius, radius };
+			D2DPenColourAlpha(fillStroke.fill.colour);
+			pRenderTarget->FillRoundedRectangle(roundedRectFill, pBrush);
+		} else {
+			D2D1_ROUNDED_RECT roundedRectFill = {
+				RectangleFromPRectangle(rc.Inset(1.0)),
+				radius-1, radius-1 };
+			D2DPenColourAlpha(fillStroke.fill.colour);
+			pRenderTarget->FillRoundedRectangle(roundedRectFill, pBrush);
 
-		D2D1_ROUNDED_RECT roundedRect = {
-			RectangleFromPRectangle(rc.Inset(0.5)),
-			4, 4};
-		D2DPenColourAlpha(fillStroke.stroke.colour);
-		pRenderTarget->DrawRoundedRectangle(roundedRect, pBrush, fillStroke.stroke.WidthF());
+			D2D1_ROUNDED_RECT roundedRect = {
+				RectangleFromPRectangle(rc.Inset(0.5)),
+				radius, radius };
+			D2DPenColourAlpha(fillStroke.stroke.colour);
+			pRenderTarget->DrawRoundedRectangle(roundedRect, pBrush, fillStroke.stroke.WidthF());
+		}
 	}
 }
 
@@ -2351,31 +2361,33 @@ void SurfaceD2D::DrawTextTransparent(PRectangle rc, const Font *font_, XYPOSITIO
 	}
 }
 
-void SurfaceD2D::MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) {
-	const FontDirectWrite *pfm = FontDirectWrite::Cast(font_);
-	if (!pfm->pTextFormat) {
-		// SetFont failed or no access to DirectWrite so give up.
-		return;
+namespace {
+
+HRESULT MeasurePositions(TextPositions &poses, const TextWide &tbuf, IDWriteTextFormat *pTextFormat) {
+	if (!pTextFormat) {
+		// Unexpected failure like no access to DirectWrite so give up.
+		return E_FAIL;
 	}
-	const int codePageText = pfm->CodePageText(mode.codePage);
-	const TextWide tbuf(text, codePageText);
-	TextPositions poses(tbuf.tlen);
+
 	// Initialize poses for safety.
 	std::fill(poses.buffer, poses.buffer + tbuf.tlen, 0.0f);
 	// Create a layout
 	IDWriteTextLayout *pTextLayout = nullptr;
-	const HRESULT hrCreate = pIDWriteFactory->CreateTextLayout(tbuf.buffer, tbuf.tlen, pfm->pTextFormat, 10000.0, 1000.0, &pTextLayout);
-	if (!SUCCEEDED(hrCreate) || !pTextLayout) {
-		return;
+	const HRESULT hrCreate = pIDWriteFactory->CreateTextLayout(tbuf.buffer, tbuf.tlen, pTextFormat, 10000.0, 1000.0, &pTextLayout);
+	if (!SUCCEEDED(hrCreate)) {
+		return hrCreate;
 	}
-	constexpr int clusters = stackBufferLength;
-	DWRITE_CLUSTER_METRICS clusterMetrics[clusters];
+	if (!pTextLayout) {
+		return E_FAIL;
+	}
+	VarBuffer<DWRITE_CLUSTER_METRICS, stackBufferLength> cm(tbuf.tlen);
 	UINT32 count = 0;
-	const HRESULT hrGetCluster = pTextLayout->GetClusterMetrics(clusterMetrics, clusters, &count);
+	const HRESULT hrGetCluster = pTextLayout->GetClusterMetrics(cm.buffer, tbuf.tlen, &count);
 	ReleaseUnknown(pTextLayout);
 	if (!SUCCEEDED(hrGetCluster)) {
-		return;
+		return hrGetCluster;
 	}
+	const DWRITE_CLUSTER_METRICS * const clusterMetrics = cm.buffer;
 	// A cluster may be more than one WCHAR, such as for "ffi" which is a ligature in the Candara font
 	XYPOSITION position = 0.0;
 	int ti=0;
@@ -2386,6 +2398,19 @@ void SurfaceD2D::MeasureWidths(const Font *font_, std::string_view text, XYPOSIT
 		position += clusterMetrics[ci].width;
 	}
 	PLATFORM_ASSERT(ti == tbuf.tlen);
+	return S_OK;
+}
+
+}
+
+void SurfaceD2D::MeasureWidths(const Font *font_, std::string_view text, XYPOSITION *positions) {
+	const FontDirectWrite *pfm = FontDirectWrite::Cast(font_);
+	const int codePageText = pfm->CodePageText(mode.codePage);
+	const TextWide tbuf(text, codePageText);
+	TextPositions poses(tbuf.tlen);
+	if (FAILED(MeasurePositions(poses, tbuf, pfm->pTextFormat))) {
+		return;
+	}
 	if (codePageText == CpUtf8) {
 		// Map the widths given for UTF-16 characters back onto the UTF-8 input string
 		size_t i = 0;
@@ -2481,37 +2506,11 @@ void SurfaceD2D::DrawTextTransparentUTF8(PRectangle rc, const Font *font_, XYPOS
 
 void SurfaceD2D::MeasureWidthsUTF8(const Font *font_, std::string_view text, XYPOSITION *positions) {
 	const FontDirectWrite *pfm = FontDirectWrite::Cast(font_);
-	if (!pfm->pTextFormat) {
-		return;
-	}
 	const TextWide tbuf(text, CpUtf8);
 	TextPositions poses(tbuf.tlen);
-	// Initialize poses for safety.
-	std::fill(poses.buffer, poses.buffer + tbuf.tlen, 0.0f);
-	// Create a layout
-	IDWriteTextLayout *pTextLayout = nullptr;
-	const HRESULT hrCreate = pIDWriteFactory->CreateTextLayout(tbuf.buffer, tbuf.tlen, pfm->pTextFormat, 10000.0, 1000.0, &pTextLayout);
-	if (!SUCCEEDED(hrCreate) || !pTextLayout) {
+	if (FAILED(MeasurePositions(poses, tbuf, pfm->pTextFormat))) {
 		return;
 	}
-	constexpr int clusters = stackBufferLength;
-	DWRITE_CLUSTER_METRICS clusterMetrics[clusters];
-	UINT32 count = 0;
-	const HRESULT hrGetCluster = pTextLayout->GetClusterMetrics(clusterMetrics, clusters, &count);
-	ReleaseUnknown(pTextLayout);
-	if (!SUCCEEDED(hrGetCluster)) {
-		return;
-	}
-	// A cluster may be more than one WCHAR, such as for "ffi" which is a ligature in the Candara font
-	XYPOSITION position = 0.0;
-	int ti = 0;
-	for (unsigned int ci = 0; ci < count; ci++) {
-		for (unsigned int inCluster = 0; inCluster < clusterMetrics[ci].length; inCluster++) {
-			poses.buffer[ti++] = position + clusterMetrics[ci].width * (inCluster + 1) / clusterMetrics[ci].length;
-		}
-		position += clusterMetrics[ci].width;
-	}
-	PLATFORM_ASSERT(ti == tbuf.tlen);
 	// Map the widths given for UTF-16 characters back onto the UTF-8 input string
 	size_t i = 0;
 	for (int ui = 0; ui < tbuf.tlen; ui++) {
@@ -2519,7 +2518,7 @@ void SurfaceD2D::MeasureWidthsUTF8(const Font *font_, std::string_view text, XYP
 		const unsigned int byteCount = UTF8BytesOfLead[uch];
 		if (byteCount == 4) {	// Non-BMP
 			ui++;
-			PLATFORM_ASSERT(ui < ti);
+			PLATFORM_ASSERT(ui < tbuf.tlen);
 		}
 		for (unsigned int bytePos=0; (bytePos<byteCount) && (i<text.length()) && (ui < tbuf.tlen); bytePos++) {
 			positions[i++] = poses.buffer[ui];
diff --git a/scintilla/win32/ScintRes.rc b/scintilla/win32/ScintRes.rc
index db07a1611..5a6fd843a 100644
--- a/scintilla/win32/ScintRes.rc
+++ b/scintilla/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "5.2.4"
-#define VERSION_WORDS 5, 2, 4, 0
+#define VERSION_SCINTILLA "5.3.0"
+#define VERSION_WORDS 5, 3, 0, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff --git a/scintilla/win32/Scintilla.vcxproj b/scintilla/win32/Scintilla.vcxproj
index bb0383659..6314fa3c3 100644
--- a/scintilla/win32/Scintilla.vcxproj
+++ b/scintilla/win32/Scintilla.vcxproj
@@ -146,7 +146,8 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <Optimization>MinSpace</Optimization>
+      <Optimization>MaxSpeed</Optimization>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -164,7 +165,8 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <Optimization>MinSpace</Optimization>
+      <Optimization>MaxSpeed</Optimization>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -179,7 +181,8 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <Optimization>MinSpace</Optimization>
+      <Optimization>MaxSpeed</Optimization>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/scintilla/win32/ScintillaWin.cxx b/scintilla/win32/ScintillaWin.cxx
index 5287fc818..491670a36 100644
--- a/scintilla/win32/ScintillaWin.cxx
+++ b/scintilla/win32/ScintillaWin.cxx
@@ -174,9 +174,11 @@ bool KeyboardIsKeyDown(int key) noexcept {
 	return (::GetKeyState(key) & 0x80000000) != 0;
 }
 
+// Bit 24 is the extended keyboard flag and the numeric keypad is non-extended
+constexpr sptr_t extendedKeyboard = 1 << 24;
+
 constexpr bool KeyboardIsNumericKeypadFunction(uptr_t wParam, sptr_t lParam) {
-	// Bit 24 is the extended keyboard flag and the numeric keypad is non-extended
-	if ((lParam & (1 << 24)) != 0) {
+	if ((lParam & extendedKeyboard) != 0) {
 		// Not from the numeric keypad
 		return false;
 	}
@@ -619,7 +621,11 @@ void ScintillaWin::Finalise() {
 
 bool ScintillaWin::UpdateRenderingParams(bool force) noexcept {
 	if (!renderingParams) {
-		renderingParams = std::make_shared<RenderingParams>();
+		try {
+			renderingParams = std::make_shared<RenderingParams>();
+		} catch (const std::bad_alloc &) {
+			return false;
+		}
 	}
 	HMONITOR monitor = ::MonitorFromWindow(MainHWND(), MONITOR_DEFAULTTONEAREST);
 	if (!force && monitor == hCurrentMonitor && renderingParams->defaultRenderingParams) {
diff --git a/scintilla/win32/deps.mak b/scintilla/win32/deps.mak
index 29b5596b8..588edba86 100644
--- a/scintilla/win32/deps.mak
+++ b/scintilla/win32/deps.mak
@@ -97,8 +97,21 @@ $(DIR_O)/CellBuffer.o: \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/SparseVector.h \
+	../src/ChangeHistory.h \
 	../src/CellBuffer.h \
 	../src/UniConversion.h
+$(DIR_O)/ChangeHistory.o: \
+	../src/ChangeHistory.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/SparseVector.h \
+	../src/ChangeHistory.h
 $(DIR_O)/CharacterCategoryMap.o: \
 	../src/CharacterCategoryMap.cxx \
 	../src/CharacterCategoryMap.h
diff --git a/scintilla/win32/makefile b/scintilla/win32/makefile
index dc7ecc3bb..0643e9e9f 100644
--- a/scintilla/win32/makefile
+++ b/scintilla/win32/makefile
@@ -87,6 +87,7 @@ SRC_OBJS = \
 	$(DIR_O)/CaseConvert.o \
 	$(DIR_O)/CaseFolder.o \
 	$(DIR_O)/CellBuffer.o \
+	$(DIR_O)/ChangeHistory.o \
 	$(DIR_O)/CharacterCategoryMap.o \
 	$(DIR_O)/CharacterType.o \
 	$(DIR_O)/CharClassify.o \
diff --git a/scintilla/win32/nmdeps.mak b/scintilla/win32/nmdeps.mak
index ee7db779b..1682eb54a 100644
--- a/scintilla/win32/nmdeps.mak
+++ b/scintilla/win32/nmdeps.mak
@@ -97,8 +97,21 @@ $(DIR_O)/CellBuffer.obj: \
 	../src/Position.h \
 	../src/SplitVector.h \
 	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/SparseVector.h \
+	../src/ChangeHistory.h \
 	../src/CellBuffer.h \
 	../src/UniConversion.h
+$(DIR_O)/ChangeHistory.obj: \
+	../src/ChangeHistory.cxx \
+	../include/ScintillaTypes.h \
+	../src/Debugging.h \
+	../src/Position.h \
+	../src/SplitVector.h \
+	../src/Partitioning.h \
+	../src/RunStyles.h \
+	../src/SparseVector.h \
+	../src/ChangeHistory.h
 $(DIR_O)/CharacterCategoryMap.obj: \
 	../src/CharacterCategoryMap.cxx \
 	../src/CharacterCategoryMap.h
diff --git a/scintilla/win32/scintilla.mak b/scintilla/win32/scintilla.mak
index 9fae09119..fb654471a 100644
--- a/scintilla/win32/scintilla.mak
+++ b/scintilla/win32/scintilla.mak
@@ -82,6 +82,7 @@ SRC_OBJS=\
 	$(DIR_O)\CaseConvert.obj \
 	$(DIR_O)\CaseFolder.obj \
 	$(DIR_O)\CellBuffer.obj \
+	$(DIR_O)\ChangeHistory.obj \
 	$(DIR_O)\CharacterCategoryMap.obj \
 	$(DIR_O)\CharacterType.obj \
 	$(DIR_O)\CharClassify.obj \