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

+ chg: rename key for undo transaction timeout value (UndoRedoSplitTimeout -> UndoTransactionTimeout)

Browse Source
This commit is contained in:
Rainer Kottenhoff 2019-08-28 12:48:08 +02:00
parent 2981fad5ac
commit 04c746dea2
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Build/Notepad3.ini
View File

@ -43,7 +43,7 @@ SettingsVersion=4
;UpdateDelayMarkAllOccurrences=50
;CurrentLineHorizontalSlop=40
;CurrentLineVerticalSlop=5
;UndoRedoSplitTimeout=0
;UndoTransactionTimeout=0
;AdministrationTool.exe=
;DevDebugMode=0
;AnalyzeReliableConfidenceLevel=67

2
Versions/build.txt
View File

@ -1 +1 @@
2603
2604

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.828.2603"
version="5.19.828.2604"
type="win32"
/>
<description>Notepad3 BETA</description>

6
src/Config/Config.cpp
View File

@ -630,9 +630,9 @@ void LoadSettings()
Defaults2.AutoReloadTimeout), 250UL, 300000UL);
FileWatching.AutoReloadTimeout = Settings2.AutoReloadTimeout;
Defaults2.UndoRedoSplitTimeout = 0UL;
Settings2.UndoRedoSplitTimeout = clampul(IniSectionGetInt(Settings2_Section, L"UndoRedoSplitTimeout",
Defaults2.UndoRedoSplitTimeout), 0UL, 86400000UL);
Defaults2.UndoTransactionTimeout = 0UL;
Settings2.UndoTransactionTimeout = clampul(IniSectionGetInt(Settings2_Section, L"UndoTransactionTimeout",
Defaults2.UndoTransactionTimeout), 0UL, 86400000UL);
// deprecated
Defaults.RenderingTechnology = IniSectionGetInt(Settings2_Section, L"SciDirectWriteTech", -111);

4
src/Notepad3.c
View File

@ -6992,7 +6992,7 @@ inline static LRESULT _MsgNotifyLean(const LPNMHDR pnmh, const SCNotification* c
}
}
if (bModified) {
DWORD const timeout = Settings2.UndoRedoSplitTimeout;
DWORD const timeout = Settings2.UndoTransactionTimeout;
if (timeout != 0UL) {
if (timeout > _MQ_IMMEDIATE) {
_DelaySplitUndoTransaction(timeout, iModType);
@ -7096,7 +7096,7 @@ static LRESULT _MsgNotifyFromEdit(HWND hwnd, const LPNMHDR pnmh, const SCNotific
}
UpdateMarginWidth();
}
DWORD const timeout = Settings2.UndoRedoSplitTimeout;
DWORD const timeout = Settings2.UndoTransactionTimeout;
if (timeout != 0UL) {
if (timeout > _MQ_IMMEDIATE) {
_DelaySplitUndoTransaction(timeout, iModType);

2
src/TypeDefs.h
View File

@ -484,7 +484,7 @@ typedef struct _settings2_t
int FindReplaceOpacityLevel;
DWORD FileCheckInverval;
DWORD AutoReloadTimeout;
DWORD UndoRedoSplitTimeout;
DWORD UndoTransactionTimeout;
int IMEInteraction;
int SciFontQuality;

2
src/VersionEx.h
View File

@ -8,7 +8,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 828
#define VERSION_BUILD 2603
#define VERSION_BUILD 2604
#define SCINTILLA_VER 420
#define ONIGURUMA_REGEX_VER 6.9.3
#define UCHARDET_VER 2018.09.27