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

+ fix: caret virtual space movement options: remove "SCVS_NOWRAPLINESTART"

Browse Source
This commit is contained in:
Rainer Kottenhoff 2020-02-16 12:43:31 +01:00
parent 0a45ad99e2
commit 31a64b809e
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Version.ps1
View File

@ -39,21 +39,23 @@ try
$Build = [int](Get-Content "Versions\build.txt")
if (!$Build) { $Build = 0 }
$LastBuildDay = [string](Get-Content "Versions\day.txt")
if ($LastBuildDay -ne "$Revis") {
$Build = 0 # reset
$Build | Set-Content "Versions\build.txt"
$Revis | Set-Content "Versions\day.txt"
}
$AppVeyorBuild = [int]($env:appveyor_build_number) # AppVeyor internal
if ($AppVeyorEnv) {
if ($LastBuildDay -ne "$Revis") {
$Revis | Set-Content "Versions\day.txt"
$Build = 1 # reset (AppVeyor)
}
$CommitID = ([string]($env:appveyor_repo_commit)).substring(0,8)
}
else {
if ($LastBuildDay -ne "$Revis") {
$Revis | Set-Content "Versions\day.txt"
$Build = 0 # reset (local build)
}
# locally: increase build number and persit it
$Build = $Build + 1
$Build | Set-Content "Versions\build.txt"
# locally: we have no commit ID, create an arificial one
$CommitID = [string](Get-Content "Versions\commit_id.txt")
if ($CommitID -eq "computername") {
@ -64,6 +66,7 @@ try
}
}
if (!$CommitID) { $CommitID = "---" }
$Build | Set-Content "Versions\build.txt"
$CompleteVer = "$Major.$Minor.$Revis.$Build"
DebugOutput("Notepad3 version number: 'v$CompleteVer $VerPatch'")

2
Versions/day.txt
View File

@ -1 +1 @@
215
216

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

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.215.1"
version="5.20.216.1"
type="win32"
/>
<description>Notepad3 RC1</description>

6
src/TypeDefs.h
View File

@ -655,8 +655,10 @@ typedef struct _themeFiles
#define NOTEPAD3_MODULE_DIR_ENV_VAR L"NOTEPAD3MODULEDIR"
//#define NP3_VIRTUAL_SPACE_ACCESS_OPTIONS (Settings2.DenyVirtualSpaceAccess ? SCVS_NONE : (SCVS_RECTANGULARSELECTION | SCVS_NOWRAPLINESTART | SCVS_USERACCESSIBLE))
#define NP3_VIRTUAL_SPACE_ACCESS_OPTIONS (Settings2.DenyVirtualSpaceAccess ? SCVS_NONE : (SCVS_RECTANGULARSELECTION | SCVS_NOWRAPLINESTART))
//~#define NP3_VIRTUAL_SPACE_ACCESS_OPTIONS (Settings2.DenyVirtualSpaceAccess ? SCVS_NONE : (SCVS_RECTANGULARSELECTION | SCVS_NOWRAPLINESTART | SCVS_USERACCESSIBLE))
//~#define NP3_VIRTUAL_SPACE_ACCESS_OPTIONS (Settings2.DenyVirtualSpaceAccess ? SCVS_NONE : (SCVS_RECTANGULARSELECTION | SCVS_NOWRAPLINESTART))
// don't use 'SCVS_NOWRAPLINESTART'
#define NP3_VIRTUAL_SPACE_ACCESS_OPTIONS (Settings2.DenyVirtualSpaceAccess ? SCVS_NONE : SCVS_RECTANGULARSELECTION)
// from <wininet.h>
#define INTERNET_MAX_PATH_LENGTH 2048

2
src/VersionEx.h
View File

@ -8,7 +8,7 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 215
#define VERSION_REV 216
#define VERSION_BUILD 1
#define SCINTILLA_VER 430
#define ONIGURUMA_REGEX_VER 6.9.4