diff --git a/Versions/build.txt b/Versions/build.txt index 0c52150b0..1ec36be23 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2690 +2691 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index a24b19057..6374b7648 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 BETA diff --git a/src/Notepad3.c b/src/Notepad3.c index 5a9d6da08..7414609ca 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -10027,6 +10027,7 @@ bool FileSave(bool bSaveAlways, bool bAsk, bool bSaveAs, bool bSaveCopy, bool bP fioStatus.iEncoding = Encoding_Current(CPI_GET); fioStatus.iEOLMode = SciCall_GetEOLMode(); +#if 0 bool bIsEmptyNewFile = false; if (StrIsEmpty(Globals.CurrentFile)) { DocPos const cchText = SciCall_GetTextLength(); @@ -10042,6 +10043,10 @@ bool FileSave(bool bSaveAlways, bool bAsk, bool bSaveAs, bool bSaveCopy, bool bP } } } +#else + bool const bIsEmptyNewFile = (StrIsEmpty(Globals.CurrentFile) && (SciCall_GetTextLength() <= 0LL)); +#endif + if (!bSaveAlways && (!IsSaveNeeded(ISN_GET) || bIsEmptyNewFile) && !bSaveAs) { int idx; diff --git a/src/VersionEx.h b/src/VersionEx.h index bdf2892f1..102765d53 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -9,7 +9,7 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 19 #define VERSION_REV 1128 -#define VERSION_BUILD 2690 +#define VERSION_BUILD 2691 #define SCINTILLA_VER 421 #define ONIGURUMA_REGEX_VER 6.9.4 #define UCHARDET_VER 2018.09.27