diff --git a/Versions/build.txt b/Versions/build.txt index 0cfbf0888..d00491fd7 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2 +1 diff --git a/Versions/day.txt b/Versions/day.txt index 92c732d00..17e344e7c 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -408 +410 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 15369c105..01edc8e09 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 NF diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp index 7bd2cc9f7..7bd560882 100644 --- a/src/Config/Config.cpp +++ b/src/Config/Config.cpp @@ -1282,7 +1282,7 @@ void LoadSettings() GET_INT_VALUE_FROM_INISECTION(PathNameFormat, 1, 0, 2); GET_INT_VALUE_FROM_INISECTION(WordWrapMode, 0, 0, 1); - GET_INT_VALUE_FROM_INISECTION(WordWrapIndent, 2, 0, 6); + GET_INT_VALUE_FROM_INISECTION(WordWrapIndent, 0, 0, 6); GET_BOOL_VALUE_FROM_INISECTION(WordWrap, false); Globals.fvBackup.bWordWrap = Settings.WordWrap; GET_BOOL_VALUE_FROM_INISECTION(TabsAsSpaces, false); Globals.fvBackup.bTabsAsSpaces = Settings.TabsAsSpaces; @@ -1296,7 +1296,7 @@ void LoadSettings() int const iWS = IniSectionGetInt(IniSecSettings, L"WordWrapSymbols", Defaults.WordWrapSymbols); Settings.WordWrapSymbols = clampi(iWS % 10, 0, 2) + clampi((iWS % 100 - iWS % 10) / 10, 0, 2) * 10; - GET_BOOL_VALUE_FROM_INISECTION(ShowWordWrapSymbols, true); + GET_BOOL_VALUE_FROM_INISECTION(ShowWordWrapSymbols, false); GET_BOOL_VALUE_FROM_INISECTION(MatchBraces, true); GET_BOOL_VALUE_FROM_INISECTION(AutoCloseTags, false); GET_INT_VALUE_FROM_INISECTION(HighlightCurrentLine, 1, 0, 2); diff --git a/src/VersionEx.h b/src/VersionEx.h index f20630691..5ba96b76e 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,12 +8,12 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 408 -#define VERSION_BUILD 2 +#define VERSION_REV 410 +#define VERSION_BUILD 1 #define SCINTILLA_VER 432 #define ONIGURUMA_REGEX_VER 6.9.5 #define UCHARDET_VER 2018.09.27 #define TINYEXPR_VER 2018.05.11 #define UTHASH_VER 2.1.0 #define VERSION_PATCH NF -#define VERSION_COMMIT_ID dkt1-amr +#define VERSION_COMMIT_ID nebukadn