From 04c746dea29686e01f870b147db3661969e865ae Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Wed, 28 Aug 2019 12:48:08 +0200
Subject: [PATCH] + chg: rename key for undo transaction timeout value
 (UndoRedoSplitTimeout -> UndoTransactionTimeout)

---
 Build/Notepad3.ini             | 2 +-
 Versions/build.txt             | 2 +-
 res/Notepad3.exe.manifest.conf | 2 +-
 src/Config/Config.cpp          | 6 +++---
 src/Notepad3.c                 | 4 ++--
 src/TypeDefs.h                 | 2 +-
 src/VersionEx.h                | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Build/Notepad3.ini b/Build/Notepad3.ini
index b09f54d90..fc1937150 100644
--- a/Build/Notepad3.ini
+++ b/Build/Notepad3.ini
@@ -43,7 +43,7 @@ SettingsVersion=4
 ;UpdateDelayMarkAllOccurrences=50
 ;CurrentLineHorizontalSlop=40
 ;CurrentLineVerticalSlop=5
-;UndoRedoSplitTimeout=0
+;UndoTransactionTimeout=0
 ;AdministrationTool.exe=
 ;DevDebugMode=0
 ;AnalyzeReliableConfidenceLevel=67
diff --git a/Versions/build.txt b/Versions/build.txt
index f72f9843d..fc45a032c 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2603
+2604
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index a3a80bdf5..39ff28c11 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.19.828.2603"
+    version="5.19.828.2604"
     type="win32"
   />
   <description>Notepad3 BETA</description>
diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp
index 2fb0292d5..338a90393 100644
--- a/src/Config/Config.cpp
+++ b/src/Config/Config.cpp
@@ -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);
diff --git a/src/Notepad3.c b/src/Notepad3.c
index fae1debe4..cd56ec607 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -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);
diff --git a/src/TypeDefs.h b/src/TypeDefs.h
index 252e77dc6..0901bf7a8 100644
--- a/src/TypeDefs.h
+++ b/src/TypeDefs.h
@@ -484,7 +484,7 @@ typedef struct _settings2_t
   int    FindReplaceOpacityLevel;
   DWORD  FileCheckInverval;
   DWORD  AutoReloadTimeout;
-  DWORD  UndoRedoSplitTimeout;
+  DWORD  UndoTransactionTimeout;
   int    IMEInteraction;
   int    SciFontQuality;
 
diff --git a/src/VersionEx.h b/src/VersionEx.h
index b2a7bc422..4cdfb5df9 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -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