From d8f6ac67ea31a33feaeca37f00d01835ce9904d7 Mon Sep 17 00:00:00 2001 From: Christian Grasser Date: Mon, 23 Nov 2015 22:11:19 +0100 Subject: [PATCH] Remove scintilla deprecated calls/defines Closes #1174 remove deprecated INDIC1_MASK and INDIC2_MASK, see http://www.scintilla.org/ScintillaDoc.html#DeprecatedMessages --- PowerEditor/src/Notepad_plus.cpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 37d7300c2..a397c37ec 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -2204,25 +2204,6 @@ void Notepad_plus::addHotSpot() unsigned char style_hotspot = 0; unsigned char mask = INDIC1_MASK; - // INDIC2_MASK == 255 and it represents MSB bit - // only LEX_HTML and LEX_POSTSCRIPT use use INDIC2_MASK bit internally - // LEX_HTML is using INDIC2_MASK bit even though it has only 127 states, so it is safe to overwrite 8th bit - // INDIC2_MASK will be used for LEX_HTML - - // LEX_POSTSCRIPT is using INDIC2_MASK bit for "tokenization", and is using mask=31 in lexer, - // therefore hotspot in LEX_POSTSCRIPT will be saved to 5th bit - // there are only 15 states in LEX_POSTSCRIPT, so it is safe to overwrite 5th bit - - // rule of the thumb is, any lexet that calls: styler.StartAt(startPos, 255); - // must have special processing here, all other lexers are fine with INDIC1_MASK (7th bit) - - LangType type = _pEditView->getCurrentBuffer()->getLangType(); - - if (type == L_HTML || type == L_PHP || type == L_ASP || type == L_JSP) - mask = INDIC2_MASK; - else if (type == L_PS) - mask = 16; - int posFound = _pEditView->execute(SCI_SEARCHINTARGET, strlen(URL_REG_EXPR), (LPARAM)URL_REG_EXPR); while (posFound != -1 && posFound != -2)