From fdca03e984401f8a5c2d299b4930efdef94c8982 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Mon, 16 Sep 2019 11:49:33 +0200
Subject: [PATCH] + fix: canonical ini-file style section order for settings
 from scratch

---
 Versions/build.txt             | 2 +-
 res/Notepad3.exe.manifest.conf | 2 +-
 src/Styles.c                   | 2 +-
 src/VersionEx.h                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Versions/build.txt b/Versions/build.txt
index 25cb6bb15..e0a1540ab 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2633
+2634
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index d064487ab..5acba9ce7 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.19.916.2633"
+    version="5.19.916.2634"
     type="win32"
   />
   <description>Notepad3 BETA</description>
diff --git a/src/Styles.c b/src/Styles.c
index 52846093b..ad4a86566 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -736,7 +736,7 @@ void Style_ToIniSection(bool bForceAll)
   SAVE_STYLE_IF_NOT_EQ_DEFAULT(Int, SelectDlgSizeY, s_cyStyleSelectDlg, STYLESELECTDLG_Y);
 
   // create canonical order of lexer sections 
-  if (bForceAll) {
+  if (bForceAll || Globals.bIniFileFromScratch) {
     for (int iLexer = 0; iLexer < COUNTOF(g_pLexArray); iLexer++)
     {
       IniSectionClear(g_pLexArray[iLexer]->pszName, true);
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 89a3d3681..c73a14e99 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 19
 #define VERSION_REV 916
-#define VERSION_BUILD 2633
+#define VERSION_BUILD 2634
 #define SCINTILLA_VER 420
 #define ONIGURUMA_REGEX_VER 6.9.3
 #define UCHARDET_VER 2018.09.27