Merge pull request #5147 from hpwamr/Mui_Beta

Preparation Version files for "Release_Candidate_6.24.309.1 rc3"
rizonesoft · Mar 9, 2024 · 5f0e3fb · 5f0e3fb
2 parents 891a7a5 + 1d8a242
commit 5f0e3fb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/Build/Changes.txt b/Build/Changes.txt
@@ -34,7 +34,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
 
 
 ========================================================
-Current BETA/RC Version 6.24.0307.(build_#) (2024-03-07)
+Current BETA/RC Version 6.24.0309.(build_#) (2024-03-09)
 ========================================================
 
 --------------------------------------------------------
@@ -134,6 +134,7 @@ CHANGES:
 FIXES:
 --------------------------------------------------------
 [.###.#]- .
+[.309.1]- Redo failure introduced with Scintilla v5.4.2 Bug 2432 (SCI).
 [.307.1]- Tinyexpr: integer values always shown in abs() format.
 [.307.1]- Remove duplicate lines.
 [.302.2]- Regression: RegEx: find previous line start (^) - skips empty lines (ONI).

diff --git a/Build/notepad3_x64_setup.iss b/Build/notepad3_x64_setup.iss
@@ -12,6 +12,7 @@
 ;#define VRSN=" beta"
 ;#define VRSN=" rc"
 ;#define VRSN=" rc2"
+;#define VRSN=" rc3"
 // but, if not a "beta, rc or rc2" version, then comment above settings and un-comment below setting :)
 #define VRSN
 #ifndef VRSN

diff --git a/Build/notepad3_x86_setup.iss b/Build/notepad3_x86_setup.iss
@@ -12,6 +12,7 @@
 ;#define VRSN=" beta"
 ;#define VRSN=" rc"
 ;#define VRSN=" rc2"
+;#define VRSN=" rc3"
 // but, if not a "beta, rc or rc2" version, then comment above settings and un-comment below setting :)
 #define VRSN
 #ifndef VRSN

diff --git a/scintilla/src/UndoHistory.cxx b/scintilla/src/UndoHistory.cxx
@@ -316,6 +316,8 @@ const char *UndoHistory::AppendAction(ActionType at, Sci::Position position, con
 	const char *dataNew = lengthData ? scraps->Push(data, lengthData) : nullptr;
 	if (currentAction >= actions.SSize()) {
 		actions.PushBack();
+	} else {
+		actions.Truncate(currentAction+1);
 	}
 	actions.Create(currentAction, at, position, lengthData, mayCoalesce);
 	currentAction++;