From ee7b89e305248062ddfb27a09f35dd5eac4bd18a Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sat, 9 Mar 2024 14:05:01 +0100 Subject: [PATCH 1/2] +fix: Redo failure introduced with Scintilla v5.4.2 Bug 2432 --- scintilla/src/UndoHistory.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scintilla/src/UndoHistory.cxx b/scintilla/src/UndoHistory.cxx index c94d0690c..b08e3a3d0 100644 --- 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++; From 1d8a24251ebc37423b7a8d87562177eaeda687cb Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Sat, 9 Mar 2024 14:12:13 +0100 Subject: [PATCH 2/2] Preparation Version files for "Release_Candidate_6.24.309.1 rc3" --- Build/Changes.txt | 3 ++- Build/notepad3_x64_setup.iss | 1 + Build/notepad3_x86_setup.iss | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index a8579edd4..bc250cb8d 100644 --- 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 index 3a9f41d66..d740090c9 100644 --- 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 index ae4f9d0ee..00d93f144 100644 --- 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