diff --git a/.gitignore b/.gitignore index 6894b5546..c6035842a 100644 --- a/.gitignore +++ b/.gitignore @@ -57,11 +57,9 @@ Thumbs.db /np3portableapp/Notepad3Portable/Notepad3Portable.exe /np3portableapp/Notepad3Portable/App/AppInfo/appinfo.ini /np3portableapp/Notepad3Portable/App/DefaultData/settings -/np3portableapp/Notepad3Portable/App/Notepad3/Docs/*.txt +/np3portableapp/Notepad3Portable/App/Notepad3/Docs /np3portableapp/Notepad3Portable/App/Notepad3/x64/*.exe /np3portableapp/Notepad3Portable/App/Notepad3/x64/lng -/np3portableapp/Notepad3Portable/App/Notepad3/x64/grepWin/*.* /np3portableapp/Notepad3Portable/App/Notepad3/x86/*.exe /np3portableapp/Notepad3Portable/App/Notepad3/x86/lng -/np3portableapp/Notepad3Portable/App/Notepad3/x86/grepWin/*.* diff --git a/Build/BackLog.txt b/Build/BackLog.txt deleted file mode 100644 index dcb9fa32c..000000000 --- a/Build/BackLog.txt +++ /dev/null @@ -1,33 +0,0 @@ -#.LOG -################################################################################ -=== Notepad3 B A C K L O G : List of things ToDo === encoding: UTF-8 -================================================================================ - -+ Title Indicator (Changed/Deleted file on disk (#2179) - -+ Migration to lexilla (Scintilla's Lexer library concept) - (Add Lexers: Kotlin, Julia, Fortran, Rexx, ...) - -+ DPI Scaling issues (initial display, moving dialog, toolbar buttons, ...) - -+ Check and Change for very long file paths (remove MAX_PATH limitation) - (https://docs.microsoft.com/de-de/windows/win32/fileio/naming-a-file?redirectedfrom=MSDN#maximum-path-length-limitation) - -+ Full "Dark Mode" capabilities - -+ Backup, AutoSave and Desaster Recovery - -+ - -################################################################################ -=== I T E M S D O N E === -================================================================================ - -- Extending MiniPath.exe for "Search text in many files" capability ... - (Search for free tools, which may be bound to Notepad3 (like minipath.exe) ... ) -=> Found, adapt and integrate "grepWin(NP3)" from Stefan Küng (author of BowPad) - - - -################################################################################ - diff --git a/Build/Changes.txt b/Build/Changes.txt index 6e632626e..8c0206bb2 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -34,7 +34,7 @@ SUP - (S)et(UP) / Installer Package ======================================================== -Current BETA/RC Version 5.20.1214.(build_#) (2020-12-14) +Current BETA/RC Version 5.20.1218.(build_#) (2020-12-18) ======================================================== -------------------------------------------------------- @@ -63,6 +63,7 @@ NEW: CHANGES: -------------------------------------------------------- [.xxx.x]- . +[1218.1]- Avoid wrap-around requester if there is no other possible occurrence. [1214.1]- Behavior change: copy to clipboard on empty selection -> don't copy anything if current line is empty. [1214.1]- Update keywords list in Style INNO Lexer. [1211.1]- No error message after decline loading file of huge size. @@ -99,6 +100,7 @@ CHANGES: FIXES: -------------------------------------------------------- [.xxx.x]- . +[1218.1]- Multi-Replace using RegExpr and Group-References. [1211.1]- Refactoring encoding detection: pure ASCII vs. 7-bit. [1125.2]- File encoding analysis with 7-bit ASCII only. [1125.2]- File save problem after switching encoding to GB2312 (52936). diff --git a/Versions/day.txt b/Versions/day.txt index efffd3bb9..5cc3b964e 100644 --- a/Versions/day.txt +++ b/Versions/day.txt @@ -1 +1 @@ -1214 +1218 diff --git a/minipath/src/VersionEx.h b/minipath/src/VersionEx.h index d675b8cb9..d956ad357 100644 --- a/minipath/src/VersionEx.h +++ b/minipath/src/VersionEx.h @@ -1,4 +1,4 @@ -#define SAPPNAME "MiniPath" +#define MNPTHNAME "MiniPath" #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_REV 2 diff --git a/minipath/src/minipath.ver b/minipath/src/minipath.ver index 9f3711f13..ae8f74bea 100644 --- a/minipath/src/minipath.ver +++ b/minipath/src/minipath.ver @@ -37,7 +37,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "FileDescription", SAPPNAME + VALUE "FileDescription", MNPTHNAME VALUE "FileVersion", VERSION_FILEVERSION_SHORT VALUE "InternalName", VERSION_INTERNALNAME VALUE "LegalCopyright", VERSION_LEGALCOPYRIGHT_LONG diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index 34882e695..e02edeb30 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/np3portableapp/build_np3portableapp.cmd @@ -102,6 +102,18 @@ if not exist "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\" ( del /s /f /q "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\*.*" ) +if not exist "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\crypto\" ( + mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\crypto\" +) else ( + del /s /f /q "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\crypto\*.*" +) + +if not exist "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\uthash\" ( + mkdir "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\uthash\" +) else ( + del /s /f /q "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\uthash\*.*" +) + :: Delete all files in "Notepad3\x86" and "Notepad3\x64" folders, except all .ini files. :: Because "blank" in filenames, the files in "gwLng" folder is NOT deleted (done below)! for /f %%f in ('dir "%NP3_PORTAPP_DIR%\App\Notepad3\x86\" /b /a-d /s ^| findstr /v /e .ini') do del "%%f" @@ -116,8 +128,8 @@ copy "%SCRIPT_DIR%..\Readme.txt" "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\Readme.txt copy "%NP3_DOC_DIR%\Notepad3.txt" "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\Notepad3.txt" /Y /V copy "%NP3_DOC_DIR%\KeyboardShortcuts.txt" "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\KeyboardShortcuts.txt" /Y /V copy "%NP3_DOC_DIR%\Oniguruma_RE.txt" "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\Oniguruma_RE.txt" /Y /V -copy "%NP3_DOC_DIR%\crypto\encryption-doc.txt" "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\encryption-doc.txt" /Y /V -copy "%NP3_DOC_DIR%\crypto\read_me.txt" "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\encrypt-read_me.txt" /Y /V +copy "%NP3_DOC_DIR%\crypto\*.txt" "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\crypto\*.txt" /Y /V +copy "%NP3_DOC_DIR%\uthash\*.txt" "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\uthash\*.txt" /Y /V copy "%NP3_GREPWIN_DIR%\grepWinLicense.txt" "%NP3_PORTAPP_DIR%\App\Notepad3\Docs\grepWinLicense.txt" /Y /V :: Copy all current "Notepad3.exe" and "MiniPath.exe" files diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index c765cad80..afcb69f65 100644 --- a/res/Notepad3.exe.manifest.conf +++ b/res/Notepad3.exe.manifest.conf @@ -3,7 +3,7 @@ Notepad3 beta diff --git a/src/VersionEx.h b/src/VersionEx.h index 12b34a00e..f0c883c02 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -8,7 +8,7 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 20 -#define VERSION_REV 1214 +#define VERSION_REV 1218 #define VERSION_BUILD 1 #define SCINTILLA_VER 446 #define ONIGURUMA_REGEX_VER 6.9.6