Merge pull request #266 from RaiKoHoff/VerCheck

Minor fixes
This commit is contained in:
Derick Payne 2018-01-02 12:25:00 +02:00 committed by GitHub
commit 48fa255ef3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions

View File

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

View File

@ -11,9 +11,14 @@ 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%
:: --------------------------------------------------------------------------------------------------------------------
@ -57,10 +62,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%"