From 9003c774517da3af738f08a1c83816d189ba66bd Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 29 Oct 2019 20:17:03 +0100 Subject: [PATCH 1/5] + ver: VS2019 version update - VS 16.3.7 --- np3portableapp/build_np3portableapp.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index 038144e3a..1bf54c50f 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/np3portableapp/build_np3portableapp.cmd @@ -34,8 +34,8 @@ set NP3_LANGUAGE_SET=af-ZA be-BY de-DE en-GB es-ES fr-FR hu-HU it-IT ja-JP ko-KR :: --- Environment --- set SCRIPT_DIR=%~dp0 -set PORTAPP_ROOT_DIR=D:\PortableApps -::set PORTAPP_ROOT_DIR=D:\Rizonesoft\PortableApps\PortableApps +::set PORTAPP_ROOT_DIR=D:\PortableApps +set PORTAPP_ROOT_DIR=D:\Rizonesoft\PortableApps\PortableApps set PORTAPP_APP_COMPACTOR=%PORTAPP_ROOT_DIR%\PortableApps.comAppCompactor\PortableApps.comAppCompactor.exe set PORTAPP_LAUNCHER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe set PORTAPP_INSTALLER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comInstaller\PortableApps.comInstaller.exe From a561dd64e349d2c0f3e2a3edf5aa1a6b9334ec82 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 29 Oct 2019 23:11:44 +0100 Subject: [PATCH 2/5] Revert "+ ver: VS2019 version update - VS 16.3.7" This reverts commit 9003c774517da3af738f08a1c83816d189ba66bd. --- np3portableapp/build_np3portableapp.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/np3portableapp/build_np3portableapp.cmd b/np3portableapp/build_np3portableapp.cmd index 1bf54c50f..038144e3a 100644 --- a/np3portableapp/build_np3portableapp.cmd +++ b/np3portableapp/build_np3portableapp.cmd @@ -34,8 +34,8 @@ set NP3_LANGUAGE_SET=af-ZA be-BY de-DE en-GB es-ES fr-FR hu-HU it-IT ja-JP ko-KR :: --- Environment --- set SCRIPT_DIR=%~dp0 -::set PORTAPP_ROOT_DIR=D:\PortableApps -set PORTAPP_ROOT_DIR=D:\Rizonesoft\PortableApps\PortableApps +set PORTAPP_ROOT_DIR=D:\PortableApps +::set PORTAPP_ROOT_DIR=D:\Rizonesoft\PortableApps\PortableApps set PORTAPP_APP_COMPACTOR=%PORTAPP_ROOT_DIR%\PortableApps.comAppCompactor\PortableApps.comAppCompactor.exe set PORTAPP_LAUNCHER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe set PORTAPP_INSTALLER_CREATOR=%PORTAPP_ROOT_DIR%\PortableApps.comInstaller\PortableApps.comInstaller.exe From 2c80b90560243d1d1ef03c22ac363729fbe9928b Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Tue, 29 Oct 2019 23:21:58 +0100 Subject: [PATCH 3/5] + ver: VS2019 version update - VS 16.3.7 --- src/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Version.h b/src/Version.h index 1cee8b8d5..eb9301ca2 100644 --- a/src/Version.h +++ b/src/Version.h @@ -74,7 +74,7 @@ #if defined(_MSC_VER) #if (_MSC_VER == 1923) #if(_MSC_FULL_VER >= 192328106) - #define VER_CPL MS Visual C++ 2019 v16.3.(3-6) + #define VER_CPL MS Visual C++ 2019 v16.3.(3-7) #elif(_MSC_FULL_VER >= 192328105) #define VER_CPL MS Visual C++ 2019 v16.3.(0-2) #endif From 267aa49112d78297d32ce3d1f4c2982dc2929502 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Thu, 31 Oct 2019 06:01:18 +0100 Subject: [PATCH 4/5] + ver: version files for beta channel (Build_2663) --- Build/Changes.txt | 3 ++- Versions/build.txt | 2 +- res/Notepad3.exe.manifest.conf | 2 +- src/VersionEx.h | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Build/Changes.txt b/Build/Changes.txt index 579e59a12..ffb65f885 100644 --- a/Build/Changes.txt +++ b/Build/Changes.txt @@ -31,7 +31,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library ================================================== -Current BETA Version 5.19.1026.#(build) (2019-10-26) +Current BETA Version 5.19.1031.#(build) (2019-10-31) ================================================== -------------------------------------------------- @@ -47,6 +47,7 @@ NEW: -------------------------------------------------- CHANGES: -------------------------------------------------- +- All *.RC files encoded as UTF-8 Signature - New Notepad3 Icon (Notepad3 icon by Vexels.com designed by smanashova@gmail.com). - Initial default big toolbar only for monitors > Full-HD. - Copy instead of insert (filename, path, GUID). diff --git a/Versions/build.txt b/Versions/build.txt index 5a85ef652..06063f6e1 100644 --- a/Versions/build.txt +++ b/Versions/build.txt @@ -1 +1 @@ -2662 +2663 diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf index 9ad063afa..8a7a695ee 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 cff1b0691..406c91e6c 100644 --- a/src/VersionEx.h +++ b/src/VersionEx.h @@ -7,8 +7,8 @@ #define SAPPNAME "Notepad3" #define VERSION_MAJOR 5 #define VERSION_MINOR 19 -#define VERSION_REV 1027 -#define VERSION_BUILD 2662 +#define VERSION_REV 1031 +#define VERSION_BUILD 2663 #define SCINTILLA_VER 420 #define ONIGURUMA_REGEX_VER 6.9.4 #define UCHARDET_VER 2018.09.27 From ec10a73c57c5a05c189fea3ede936619282ad818 Mon Sep 17 00:00:00 2001 From: Pairi Daiza Date: Thu, 31 Oct 2019 10:03:32 +0100 Subject: [PATCH 5/5] Add a test file --- ...5 non-breaking space character (issue #1726).txt | Bin 0 -> 4 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test/test_files/encoding/Txtfiles/alt255 non-breaking space character (issue #1726).txt diff --git a/test/test_files/encoding/Txtfiles/alt255 non-breaking space character (issue #1726).txt b/test/test_files/encoding/Txtfiles/alt255 non-breaking space character (issue #1726).txt new file mode 100644 index 0000000000000000000000000000000000000000..a5362aabf8bbfa0ad0ad0c6fd74e7d57858c504c GIT binary patch literal 4 LcmezWPk{jd2RZ^C literal 0 HcmV?d00001