CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-20 21:13:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5147 from hpwamr/Mui_Beta

Browse Source 
Preparation Version files for "Release_Candidate_6.24.309.1  rc3"
This commit is contained in:
Pairi Daiza 2024-03-09 14:39:52 +01:00 committed by GitHub
commit 5f0e3fb2d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Build/Changes.txt
View File

@ -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).

1
Build/notepad3_x64_setup.iss
View File

@ -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

1
Build/notepad3_x86_setup.iss
View File

@ -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

2
scintilla/src/UndoHistory.cxx
View File

@ -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++;