CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'Scintilla_376' into Scintilla_400

Browse Source
This commit is contained in:
Rainer Kottenhoff 2017-08-17 08:52:52 +02:00
commit 024ec5d82a
5 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scintilla/lexers/LexBaan.cxx
View File

@ -523,7 +523,7 @@ void SCI_METHOD LexerBaan::Lex(Sci_PositionU startPos, Sci_Position length, int
sc.SetState(SCE_BAAN_DEFAULT);
break;
case SCE_BAAN_NUMBER:
if (IsASpaceOrTab(sc.ch) || sc.ch == '\r' || sc.ch == '\n') {
if (IsASpaceOrTab(sc.ch) || sc.ch == '\r' || sc.ch == '\n' || IsAnOperator(sc.ch)) {
sc.SetState(SCE_BAAN_DEFAULT);
}
else if ((numberIsHex && !(MakeLowerCase(sc.ch) == 'x' || MakeLowerCase(sc.ch) == 'e' ||

2
scintilla/version.txt
View File

@ -1 +1 @@
375
376

9
src/Edit.c
View File

@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
* *
* *
* Notepad3 *
@ -1776,11 +1776,12 @@ void EditTitleCase(HWND hwnd)
else {
//Slightly enhanced function to make Title Case: Added some '-characters and bPrevWasSpace makes it better (for example "'Don't'" will now work)
// Slightly enhanced function to make Title Case:
// Added some '-characters and bPrevWasSpace makes it better (for example "'Don't'" will now work)
bPrevWasSpace = TRUE;
for (i = 0; i < cchTextW; i++)
{
if (!IsCharAlphaNumericW(pszTextW[i]) && (!StrChr(L"'`´’",pszTextW[i]) || bPrevWasSpace ) )
if (!IsCharAlphaNumericW(pszTextW[i]) && (!StrChr(L"'`΄’",pszTextW[i]) || bPrevWasSpace ) )
{
bNewWord = TRUE;
}
@ -4068,7 +4069,7 @@ void EditWrapToColumn(HWND hwnd,int nColumn/*,int nTabWidth*/)
cchConvW = 0;
iLineLength = 0;
#define ISDELIMITER(wc) StrChr(L",;.:-+%&¦|/*?!\"\'~´#=",wc)
#define ISDELIMITER(wc) StrChr(L",;.:-+%&¦|/*?!\"\'~΄#=",wc)
#define ISWHITE(wc) StrChr(L" \t",wc)
#define ISWORDEND(wc) (/*ISDELIMITER(wc) ||*/ StrChr(L" \t\r\n",wc))

9
src/Notepad3.c
View File

@ -3774,10 +3774,6 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam)
}
else
{
// define (behöver bara göra detta en gång egentligen)
//SendMessage( hwndEdit , SCI_MARKERSETBACK , 0 , 74 | (203 << 8) | (0 << 16) ); //behöver bara göra detta en gång egentligen
//SendMessage( hwndEdit , SCI_MARKERDEFINE , 0 , SC_MARK_ARROWS ); //behöver bara göra detta en gång egentligen
if( bShowSelectionMargin )
{
SendMessage( hwndEdit , SCI_MARKERDEFINEPIXMAP , 0 , (LPARAM)bookmark_pixmap );
@ -3788,11 +3784,6 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam)
SendMessage( hwndEdit , SCI_MARKERSETALPHA , 0 , 20);
SendMessage( hwndEdit , SCI_MARKERDEFINE , 0 , SC_MARK_BACKGROUND );
}
//SendMessage( hwndEdit , SCI_MARKERSETBACK , 0 , 180 | (255 << 8) | (180 << 16) ); //behöver bara göra detta en gång egentligen
//SendMessage( hwndEdit , SCI_MARKERDEFINE , 0 , SC_MARK_BACKGROUND ); //behöver bara göra detta en gång egentligen
// set
SendMessage( hwndEdit , SCI_MARKERADD , iLine , 0 );
//SendMessage( hwndEdit , SCI_MARKERADD , iLine , 1 );

12
src/Version.h
View File

@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
* *
* *
* Notepad3 *
@ -32,14 +32,14 @@
#define VERSION_FILEVERSION_NUM VERSION_MAJOR,VERSION_MINOR,VERSION_REV,VERSION_BUILD
#define VERSION_FILEVERSION STRINGIFY(VERSION_MAJOR) "." STRINGIFY(VERSION_MINOR) "." \
STRINGIFY(VERSION_REV) "." STRINGIFY(VERSION_BUILD)
#define VERSION_LEGALCOPYRIGHT L"Copyright © 2008-2017 Rizonesoft"
//#define VERSION_LEGALCOPYRIGHT_LONG L"© Rizonesoft 2008-2016"
#define VERSION_AUTHORNAME L"Rizonesoft"
#define VERSION_LEGALCOPYRIGHT L"Copyright © 2008-2017 Rizonesoft"
//#define VERSION_LEGALCOPYRIGHT_LONG L"© Rizonesoft 2008-2017"
#define VERSION_AUTHORNAME L"© Rizonesoft"
#define VERSION_WEBPAGEDISPLAY L"https://www.rizonesoft.com"
#define VERSION_COMPANYNAME L"Rizonesoft"
#define VERSION_COMPANYNAME L"© Rizonesoft"
#define VERSION_MODPAGEDISPLAY L"https://xhmikosr.github.io/notepad2-mod/"
#define VERSION_WEBPAGE2DISPLAY L"http://www.flos-freeware.ch"
#define VERSION_SCIVERSION L"Scintilla Library Version: 375"
#define VERSION_SCIVERSION L"Scintilla Library Version: 376"
#if defined(_WIN64)
#define VERSION_FILEVERSION_LONG L"Notepad3 (64-bit) " STRINGIFY(VERSION_MAJOR) L" Build " \