From 5fd68f8f9f08e29274debc80ed0b468802899f06 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Tue, 2 Jan 2018 08:20:09 +0100 Subject: [PATCH 1/3] + fix: test version numbers for month Jan - Sep (mono digit) --- test/TestFileVersion.cmd | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/TestFileVersion.cmd b/test/TestFileVersion.cmd index 58eebc4c8..99fc8a154 100644 --- a/test/TestFileVersion.cmd +++ b/test/TestFileVersion.cmd @@ -11,10 +11,16 @@ set NP3_BUILD_VER=%SCRIPT_DIR%..\Versions\build.txt set YY=00 set MM=00 set DD=00 + call :GETDATE +set "LZ=%MM:~0,1%" +if [%LZ%]==[0] set "MM=%MM:~1,1%" + set BUILD=0 call :GETBUILD "%~1" + set VERSHOULD=3.%YY%.%MM%%DD%.%BUILD% +echo VERSHOULD: "%VERSHOULD%" :: -------------------------------------------------------------------------------------------------------------------- @@ -57,10 +63,11 @@ goto:EOF for /f "tokens=2 delims==" %%a in (' wmic OS Get localdatetime /value ') do set "dt=%%a" -set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%dt:~5,1%" & set "DD=%dt:~6,2%" +set "YY=%dt:~2,2%" & set "YYYY=%dt:~0,4%" & set "MM=%dt:~4,2%" & set "DD=%dt:~6,2%" set "HH=%dt:~8,2%" & set "Min=%dt:~10,2%" & set "Sec=%dt:~12,2%" ::set "datestamp=%YYYY%%MM%%DD%" & set "timestamp=%HH%%Min%%Sec%" ::set "fullstamp=%YYYY%-%MM%-%DD%_%HH%-%Min%-%Sec%" +::echo src: "%dt%" ::echo datestamp: "%datestamp%" ::echo timestamp: "%timestamp%" ::echo fullstamp: "%fullstamp%" From 2a21986b6166f4fd9c1f173dbc50d01ac50066d6 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Tue, 2 Jan 2018 08:28:28 +0100 Subject: [PATCH 2/3] + fix: redundant echo of expected version string --- test/TestFileVersion.cmd | 1 - 1 file changed, 1 deletion(-) diff --git a/test/TestFileVersion.cmd b/test/TestFileVersion.cmd index 99fc8a154..8f1eec575 100644 --- a/test/TestFileVersion.cmd +++ b/test/TestFileVersion.cmd @@ -20,7 +20,6 @@ set BUILD=0 call :GETBUILD "%~1" set VERSHOULD=3.%YY%.%MM%%DD%.%BUILD% -echo VERSHOULD: "%VERSHOULD%" :: -------------------------------------------------------------------------------------------------------------------- From 8d60ac9f85aa9b28f83c6f6787af77cde0e2a0b5 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Tue, 2 Jan 2018 08:42:18 +0100 Subject: [PATCH 3/3] + fix: toggle line comments were placed at line end --- src/Edit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Edit.c b/src/Edit.c index ff70f812b..cfdbcb995 100644 --- a/src/Edit.c +++ b/src/Edit.c @@ -2825,6 +2825,7 @@ void EditToggleLineComments(HWND hwnd,LPCWSTR pwszComment,BOOL bInsertAtStart) if ((SC_SEL_RECTANGLE != SciCall_GetSelectionMode()) && (cchComment > 0)) { + int iCommentCol = 0; int iLineStart = SciCall_LineFromPosition(iSelStart); int iLineEnd = SciCall_LineFromPosition(iSelEnd); @@ -2834,9 +2835,9 @@ void EditToggleLineComments(HWND hwnd,LPCWSTR pwszComment,BOOL bInsertAtStart) --iLineEnd; } - int iCommentCol = 1024; if (!bInsertAtStart) { + iCommentCol = 1024; for (int iLine = iLineStart; iLine <= iLineEnd; iLine++) { int iLineEndPos = SciCall_GetLineEndPosition(iLine);