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

Merge branch 'RC2_DEV' into NewFeatures_grepWinNP3

Browse Source 
# Conflicts:
#	Versions/build.txt
#	res/Notepad3.exe.manifest.conf
#	src/VersionEx.h
This commit is contained in:
Rainer Kottenhoff 2020-04-10 10:15:42 +02:00
commit 69b49d7900
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
2
1

2
Versions/day.txt
View File

@ -1 +1 @@
408
410

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

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.408.2"
version="5.20.410.1"
type="win32"
/>
<description>Notepad3 NF</description>

4
src/Config/Config.cpp
View File

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

6
src/VersionEx.h
View File

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