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 pull request #1824 from RaiKoHoff/DevNewFeatures

Browse Source 
Don't auto-close blank untitled document
This commit is contained in:
Rainer Kottenhoff 2019-11-28 17:33:32 +01:00 committed by GitHub
commit 1e14dcd4e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Versions/build.txt
View File

@ -1 +1 @@
2690
2691

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

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.19.1128.2690"
version="5.19.1128.2691"
type="win32"
/>
<description>Notepad3 BETA</description>

5
src/Notepad3.c
View File

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

2
src/VersionEx.h
View File

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