From 59c07a16e6bfec078dbc4e35093a6d102b4c7805 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Wed, 3 Oct 2018 14:43:17 +0200
Subject: [PATCH 1/2] + upd: to Scintilla library  v4.1.2

---
 scintilla/doc/ScintillaDoc.html      |   6 +-
 scintilla/doc/ScintillaDownload.html |  10 +-
 scintilla/doc/ScintillaHistory.html  |   5 +-
 scintilla/doc/index.html             |   7 +-
 scintilla/include/Scintilla.iface    |   2 +-
 scintilla/src/Editor.cxx             | 146 ++++++++++++++-------------
 scintilla/src/PositionCache.cxx      |   5 +-
 scintilla/version.txt                |   2 +-
 8 files changed, 94 insertions(+), 89 deletions(-)

diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html
index f789e6a0e..ee78740e0 100644
--- a/scintilla/doc/ScintillaDoc.html
+++ b/scintilla/doc/ScintillaDoc.html
@@ -1537,7 +1537,7 @@ <h2 id="ByCharacterOrCodeUnit">By character or UTF-16 code unit</h2>
      <a class="message" href="#SCI_ALLOCATELINECHARACTERINDEX">SCI_ALLOCATELINECHARACTERINDEX(int lineCharacterIndex)</a><br />
      <a class="message" href="#SCI_RELEASELINECHARACTERINDEX">SCI_RELEASELINECHARACTERINDEX(int lineCharacterIndex)</a><br />
      <a class="message" href="#SCI_LINEFROMINDEXPOSITION">SCI_LINEFROMINDEXPOSITION(int pos, int lineCharacterIndex) &rarr; int</a><br />
-     <a class="message" href="#SCI_INDEXPOSITIONFROMLINE">SCI_INDEXPOSITIONFROMLINE(int line, int lineCharacterIndex) &rarr; int</a><br />
+     <a class="message" href="#SCI_INDEXPOSITIONFROMLINE">SCI_INDEXPOSITIONFROMLINE(int line, int lineCharacterIndex) &rarr; position</a><br />
     </code>
 
     <p><b id="SCI_POSITIONRELATIVE">SCI_POSITIONRELATIVE(int pos, int relative) &rarr; position</b><br />
@@ -1549,7 +1549,7 @@ <h2 id="ByCharacterOrCodeUnit">By character or UTF-16 code unit</h2>
     <p><b id="SCI_COUNTCHARACTERS">SCI_COUNTCHARACTERS(int start, int end) &rarr; int</b><br />
      Returns the number of whole characters between two positions.</p>
 
-    <p><b id="SCI_POSITIONRELATIVECODEUNITS">SCI_POSITIONRELATIVECODEUNITS(int pos, int relative) &rarr; int</b><br />
+    <p><b id="SCI_POSITIONRELATIVECODEUNITS">SCI_POSITIONRELATIVECODEUNITS(int pos, int relative) &rarr; position</b><br />
     <b id="SCI_COUNTCODEUNITS">SCI_COUNTCODEUNITS(int start, int end) &rarr; int</b><br />
      These are the UTF-16 versions of <code>SCI_POSITIONRELATIVE</code> and <code>SCI_COUNTCHARACTERS</code>
      working in terms of UTF-16 code units.</p>
@@ -1569,7 +1569,7 @@ <h2 id="ByCharacterOrCodeUnit">By character or UTF-16 code unit</h2>
      Only one index of each type is created for a document at a time.</p>
 
     <p><b id="SCI_LINEFROMINDEXPOSITION">SCI_LINEFROMINDEXPOSITION(int pos, int lineCharacterIndex) &rarr; int</b><br />
-    <b id="SCI_INDEXPOSITIONFROMLINE">SCI_INDEXPOSITIONFROMLINE(int line, int lineCharacterIndex) &rarr; int</b><br />
+    <b id="SCI_INDEXPOSITIONFROMLINE">SCI_INDEXPOSITIONFROMLINE(int line, int lineCharacterIndex) &rarr; position</b><br />
      The document line of a particular character or code unit may be found by calling <code>SCI_LINEFROMINDEXPOSITION</code> with one of
      <code>SC_LINECHARACTERINDEX_UTF32(1)</code> or <code>SC_LINECHARACTERINDEX_UTF16(2)</code>.
      The inverse action, finds the starting position of a document line either in characters or code units from the document start by calling
diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html
index a6a768913..971aae2e0 100644
--- a/scintilla/doc/ScintillaDownload.html
+++ b/scintilla/doc/ScintillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/scintilla411.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla412.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla411.tgz">
+	<a href="https://www.scintilla.org/scintilla412.tgz">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@ <h2>
       containing very few restrictions.
     </p>
     <h3>
-       Release 4.1.1
+       Release 4.1.2
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@ <h4>
        The source code package contains all of the source code for Scintilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/scintilla411.zip">zip format</a> (1600K) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla411.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla412.zip">zip format</a> (1600K) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla412.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html
index 2654c0619..236dbb107 100644
--- a/scintilla/doc/ScintillaHistory.html
+++ b/scintilla/doc/ScintillaHistory.html
@@ -552,7 +552,7 @@ <h3>
     </h3>
     <ul>
 	<li>
-	Released 9 September 2018.
+	Released 2 October 2018.
 	</li>
 	<li>
 	C++ lexer fixes evaluation of "#elif".
@@ -562,7 +562,8 @@ <h3>
 	Markdown lexer fixes highlighting of non-ASCII characters in links.
 	</li>
 	<li>
-	SciTE on Win32 makes Del key work again in find and replace strips.
+	SciTE on Win32 drops menukey feature, makes Del key work again in find and replace strips
+	and disables F5 while command running.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2044/">Bug #2044</a>.
 	</li>
     </ul>
diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html
index e6c6466b3..47dc10c15 100644
--- a/scintilla/doc/index.html
+++ b/scintilla/doc/index.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20180909" />
+    <meta name="Date.Modified" content="20181002" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         #versionlist {
@@ -56,8 +56,8 @@
           GTK+, and OS X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 4.1.1<br />
-           Site last modified September 9 2018</font>
+          <font color="#FFCC99" size="3"> Release version 4.1.2<br />
+           Site last modified October 2 2018</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,6 +72,7 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 4.1.2 is a minor release.</li>
       <li>Version 4.1.1 adds optional indexing of line starts in UTF-8 documents by UTF-32 code points and UTF-16 code units.</li>
       <li>Version 4.1.0 adds experimental support for bidirectional text as used by Arabic and Hebrew on Win32 and Cocoa.</li>
       <li>Version 4.0.5 adds experimental support for documents larger than 2 GigaBytes.</li>
diff --git a/scintilla/include/Scintilla.iface b/scintilla/include/Scintilla.iface
index e96e5a6a6..a8e60baa6 100644
--- a/scintilla/include/Scintilla.iface
+++ b/scintilla/include/Scintilla.iface
@@ -4975,7 +4975,7 @@ fun void AllocateLineCharacterIndex=2711(int lineCharacterIndex,)
 fun void ReleaseLineCharacterIndex=2712(int lineCharacterIndex,)
 
 # Retrieve the document line containing a position measured in index units.
-fun int LineFromIndexPosition=2713(position posUTF32, int lineCharacterIndex)
+fun int LineFromIndexPosition=2713(position pos, int lineCharacterIndex)
 
 # Retrieve the position measured in index units at the start of a document line.
 fun position IndexPositionFromLine=2714(int line, int lineCharacterIndex)
diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx
index 60b51ba68..bdde43167 100644
--- a/scintilla/src/Editor.cxx
+++ b/scintilla/src/Editor.cxx
@@ -73,7 +73,7 @@ static bool CanDeferToLastStep(const DocModification &mh) {
 
 static bool CanEliminate(const DocModification &mh) {
 	return
-			(mh.modificationType & (SC_MOD_BEFOREINSERT | SC_MOD_BEFOREDELETE)) != 0;
+	    (mh.modificationType & (SC_MOD_BEFOREINSERT | SC_MOD_BEFOREDELETE)) != 0;
 }
 
 /*
@@ -82,10 +82,10 @@ static bool CanEliminate(const DocModification &mh) {
 */
 static bool IsLastStep(const DocModification &mh) {
 	return
-			(mh.modificationType & (SC_PERFORMED_UNDO | SC_PERFORMED_REDO)) != 0
-			&& (mh.modificationType & SC_MULTISTEPUNDOREDO) != 0
-			&& (mh.modificationType & SC_LASTSTEPINUNDOREDO) != 0
-			&& (mh.modificationType & SC_MULTILINEUNDOREDO) != 0;
+	    (mh.modificationType & (SC_PERFORMED_UNDO | SC_PERFORMED_REDO)) != 0
+	    && (mh.modificationType & SC_MULTISTEPUNDOREDO) != 0
+	    && (mh.modificationType & SC_LASTSTEPINUNDOREDO) != 0
+	    && (mh.modificationType & SC_MULTILINEUNDOREDO) != 0;
 }
 
 Timer::Timer() :
@@ -206,7 +206,7 @@ void Editor::SetRepresentations() {
 	reprs.Clear();
 
 	// C0 control set
-	const char * const reps[] = {
+	const char *const reps[] = {
 		"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL",
 		"BS", "HT", "LF", "VT", "FF", "CR", "SO", "SI",
 		"DLE", "DC1", "DC2", "DC3", "DC4", "NAK", "SYN", "ETB",
@@ -220,7 +220,7 @@ void Editor::SetRepresentations() {
 	// C1 control set
 	// As well as Unicode mode, ISO-8859-1 should use these
 	if (IsUnicodeMode()) {
-		const char * const repsC1[] = {
+		const char *const repsC1[] = {
 			"PAD", "HOP", "BPH", "NBH", "IND", "NEL", "SSA", "ESA",
 			"HTS", "HTJ", "VTS", "PLD", "PLU", "RI", "SS2", "SS3",
 			"DCS", "PU1", "PU2", "STS", "CCH", "MW", "SPA", "EPA",
@@ -294,7 +294,7 @@ void Editor::RefreshStyleData() {
 }
 
 Point Editor::GetVisibleOriginInMain() const {
-	return Point(0,0);
+	return Point(0, 0);
 }
 
 PointDocument Editor::DocumentPointFromView(Point ptView) const {
@@ -636,7 +636,7 @@ void Editor::InvalidateWholeSelection() {
 }
 
 /* For Line selection - the anchor and caret are always
-	 at the beginning and end of the region lines. */
+   at the beginning and end of the region lines. */
 SelectionRange Editor::LineSelectionRange(SelectionPosition currentPos_, SelectionPosition anchor_) const {
 	if (currentPos_ > anchor_) {
 		anchor_ = SelectionPosition(
@@ -823,13 +823,13 @@ SelectionPosition Editor::MovePositionOutsideChar(SelectionPosition pos, Sci::Po
 		if (moveDir > 0) {
 			if ((pos.Position() > 0) && vs.styles[pdoc->StyleIndexAt(pos.Position() - 1)].IsProtected()) {
 				while ((pos.Position() < pdoc->Length()) &&
-								(vs.styles[pdoc->StyleIndexAt(pos.Position())].IsProtected()))
+				        (vs.styles[pdoc->StyleIndexAt(pos.Position())].IsProtected()))
 					pos.Add(1);
 			}
 		} else if (moveDir < 0) {
 			if (vs.styles[pdoc->StyleIndexAt(pos.Position())].IsProtected()) {
 				while ((pos.Position() > 0) &&
-								(vs.styles[pdoc->StyleIndexAt(pos.Position() - 1)].IsProtected()))
+				        (vs.styles[pdoc->StyleIndexAt(pos.Position() - 1)].IsProtected()))
 					pos.Add(-1);
 			}
 		}
@@ -1025,7 +1025,7 @@ void Editor::MoveSelectedLines(int lineDelta) {
 	// stop it right there!
 	if ((selectionStart == 0 && lineDelta < 0)
 		|| (selectionEnd == pdoc->Length() && lineDelta > 0)
-					|| selectionStart == selectionEnd) {
+	        || selectionStart == selectionEnd) {
 		return;
 	}
 
@@ -1075,15 +1075,15 @@ void Editor::MoveCaretInsideView(bool ensureVisible) {
 	const Point pt = PointMainCaret();
 	if (pt.y < rcClient.top) {
 		MovePositionTo(SPositionFromLocation(
-								Point::FromInts(lastXChosen - xOffset, static_cast<int>(rcClient.top)),
+		            Point::FromInts(lastXChosen - xOffset, static_cast<int>(rcClient.top)),
 					false, false, UserVirtualSpace()),
 					Selection::noSel, ensureVisible);
 	} else if ((pt.y + vs.lineHeight - 1) > rcClient.bottom) {
 		const ptrdiff_t yOfLastLineFullyDisplayed = static_cast<ptrdiff_t>(rcClient.top) + (LinesOnScreen() - 1) * vs.lineHeight;
 		MovePositionTo(SPositionFromLocation(
-								Point::FromInts(lastXChosen - xOffset, static_cast<int>(rcClient.top + yOfLastLineFullyDisplayed)),
+		            Point::FromInts(lastXChosen - xOffset, static_cast<int>(rcClient.top + yOfLastLineFullyDisplayed)),
 					false, false, UserVirtualSpace()),
-						Selection::noSel, ensureVisible);
+		        Selection::noSel, ensureVisible);
 	}
 }
 
@@ -1119,23 +1119,23 @@ the left and bottom UZs are extended up to right and top UZs respectively.
 This way, we favour the displaying of useful information: the beginning of lines,
 where most code reside, and the lines after the caret, eg. the body of a function.
 
-		 |        |       |      |                                            |
+     |        |       |      |                                            |
 slop | strict | jumps | even | Caret can go to the margin                 | When reaching limit (caret going out of
-		 |        |       |      |                                            | visibility or going into the UZ) display is...
+     |        |       |      |                                            | visibility or going into the UZ) display is...
 -----+--------+-------+------+--------------------------------------------+--------------------------------------------------------------
-	0  |   0    |   0   |   0  | Yes                                        | moved to put caret on top/on right
-	0  |   0    |   0   |   1  | Yes                                        | moved by one position
-	0  |   0    |   1   |   0  | Yes                                        | moved to put caret on top/on right
-	0  |   0    |   1   |   1  | Yes                                        | centred on the caret
-	0  |   1    |   -   |   0  | Caret is always on top/on right of display | -
-	0  |   1    |   -   |   1  | No, caret is always centred                | -
-	1  |   0    |   0   |   0  | Yes                                        | moved to put caret out of the asymmetrical UZ
-	1  |   0    |   0   |   1  | Yes                                        | moved to put caret out of the UZ
-	1  |   0    |   1   |   0  | Yes                                        | moved to put caret at 3UZ of the top or right margin
-	1  |   0    |   1   |   1  | Yes                                        | moved to put caret at 3UZ of the margin
-	1  |   1    |   -   |   0  | Caret is always at UZ of top/right margin  | -
-	1  |   1    |   0   |   1  | No, kept out of UZ                         | moved by one position
-	1  |   1    |   1   |   1  | No, kept out of UZ                         | moved to put caret at 3UZ of the margin
+  0  |   0    |   0   |   0  | Yes                                        | moved to put caret on top/on right
+  0  |   0    |   0   |   1  | Yes                                        | moved by one position
+  0  |   0    |   1   |   0  | Yes                                        | moved to put caret on top/on right
+  0  |   0    |   1   |   1  | Yes                                        | centred on the caret
+  0  |   1    |   -   |   0  | Caret is always on top/on right of display | -
+  0  |   1    |   -   |   1  | No, caret is always centred                | -
+  1  |   0    |   0   |   0  | Yes                                        | moved to put caret out of the asymmetrical UZ
+  1  |   0    |   0   |   1  | Yes                                        | moved to put caret out of the UZ
+  1  |   0    |   1   |   0  | Yes                                        | moved to put caret at 3UZ of the top or right margin
+  1  |   0    |   1   |   1  | Yes                                        | moved to put caret at 3UZ of the margin
+  1  |   1    |   -   |   0  | Caret is always at UZ of top/right margin  | -
+  1  |   1    |   0   |   1  | No, kept out of UZ                         | moved by one position
+  1  |   1    |   1   |   1  | No, kept out of UZ                         | moved to put caret at 3UZ of the margin
 */
 
 Editor::XYScrollPosition Editor::XYScrollToMakeVisible(const SelectionRange &range, const XYScrollOptions options) {
@@ -1322,7 +1322,7 @@ Editor::XYScrollPosition Editor::XYScrollToMakeVisible(const SelectionRange &ran
 			}
 		} else {	// No slop
 			if (bStrict ||
-							(bJump && (pt.x < rcClient.left || pt.x >= rcClient.right))) {
+			        (bJump && (pt.x < rcClient.left || pt.x >= rcClient.right))) {
 				// Strict or going out of display
 				if (bEven) {
 					// Center caret
@@ -1694,7 +1694,7 @@ void Editor::RefreshPixMaps(Surface *surfaceWindow) {
 		if (!view.pixmapLine->Initialised()) {
 
 			view.pixmapLine->InitPixMap(static_cast<int>(rcClient.Width()), vs.lineHeight,
-							surfaceWindow, wMain.GetID());
+			        surfaceWindow, wMain.GetID());
 		}
 		if (!marginView.pixmapSelMargin->Initialised()) {
 			marginView.pixmapSelMargin->InitPixMap(vs.fixedColumnWidth,
@@ -1894,7 +1894,6 @@ void Editor::AddCharUTF(const char *s, unsigned int len, bool treatAsDBCS) {
 
 		// Vector elements point into selection in order to change selection.
 		std::vector<SelectionRange *> selPtrs;
-		selPtrs.reserve(sel.Count());
 		for (size_t r = 0; r < sel.Count(); r++) {
 			selPtrs.push_back(&sel.Range(r));
 		}
@@ -1976,7 +1975,7 @@ void Editor::AddCharUTF(const char *s, unsigned int len, bool treatAsDBCS) {
 		}
 		NotifyChar(byte);
 	}
-	
+
 	if (recordingMacro) {
 		NotifyMacroRecord(SCI_REPLACESEL, 0, reinterpret_cast<sptr_t>(s));
 	}
@@ -2541,7 +2540,7 @@ void Editor::NotifyModified(Document *, DocModification mh, void *) {
 	if (mh.modificationType & SC_MOD_CHANGELINESTATE) {
 		if (paintState == painting) {
 			CheckForChangeOutsidePaint(
-					Range(pdoc->LineStart(mh.line),
+			    Range(pdoc->LineStart(mh.line),
 					pdoc->LineStart(mh.line + 1)));
 		} else {
 			// Could check that change is before last visible line.
@@ -2554,7 +2553,7 @@ void Editor::NotifyModified(Document *, DocModification mh, void *) {
 	if (mh.modificationType & SC_MOD_LEXERSTATE) {
 		if (paintState == painting) {
 			CheckForChangeOutsidePaint(
-					Range(mh.position, mh.position + mh.length));
+			    Range(mh.position, mh.position + mh.length));
 		} else {
 			Redraw();
 		}
@@ -2852,9 +2851,9 @@ void Editor::PageMove(int direction, Selection::selTypes selt, bool stuttered) {
 	const Sci::Line currentLine = pdoc->SciLineFromPosition(sel.MainCaret());
 	const Sci::Line topStutterLine = topLine + caretYSlop;
 	const Sci::Line bottomStutterLine =
-			pdoc->SciLineFromPosition(PositionFromLocation(
-									Point::FromInts(lastXChosen - xOffset, direction * vs.lineHeight * static_cast<int>(LinesToScroll()))))
-			- caretYSlop - 1;
+	    pdoc->SciLineFromPosition(PositionFromLocation(
+	                Point::FromInts(lastXChosen - xOffset, direction * vs.lineHeight * static_cast<int>(LinesToScroll()))))
+	    - caretYSlop - 1;
 
 	if (stuttered && (direction < 0 && currentLine > topStutterLine)) {
 		topLineNew = topLine;
@@ -2870,7 +2869,7 @@ void Editor::PageMove(int direction, Selection::selTypes selt, bool stuttered) {
 		const Point pt = LocationFromPosition(sel.MainCaret());
 
 		topLineNew = std::clamp<Sci::Line>(
-								topLine + direction * LinesToScroll(), 0, MaxScrollPos());
+		            topLine + direction * LinesToScroll(), 0, MaxScrollPos());
 		newPos = SPositionFromLocation(
 			Point::FromInts(lastXChosen - xOffset, static_cast<int>(pt.y) +
 				direction * (vs.lineHeight * static_cast<int>(LinesToScroll()))),
@@ -4022,9 +4021,9 @@ CaseFolder *Editor::CaseFolderForEncoding() {
  * @return The position of the found text, -1 if not found.
  */
 Sci::Position Editor::FindText(
-		uptr_t wParam,		///< Search modes : @c SCFIND_MATCHCASE, @c SCFIND_WHOLEWORD,
-		///< @c SCFIND_WORDSTART, @c SCFIND_REGEXP or @c SCFIND_POSIX.
-		sptr_t lParam) {	///< @c Sci_TextToFind structure: The text to search for in the given range.
+    uptr_t wParam,		///< Search modes : @c SCFIND_MATCHCASE, @c SCFIND_WHOLEWORD,
+    ///< @c SCFIND_WORDSTART, @c SCFIND_REGEXP or @c SCFIND_POSIX.
+    sptr_t lParam) {	///< @c Sci_TextToFind structure: The text to search for in the given range.
 
 	Sci_TextToFind *ft = static_cast<Sci_TextToFind *>(PtrFromSPtr(lParam));
 	Sci::Position lengthFound = strlen(ft->lpstrText);
@@ -4069,10 +4068,10 @@ void Editor::SearchAnchor() {
  * @return The position of the found text, -1 if not found.
  */
 Sci::Position Editor::SearchText(
-		unsigned int iMessage,		///< Accepts both @c SCI_SEARCHNEXT and @c SCI_SEARCHPREV.
-		uptr_t wParam,				///< Search modes : @c SCFIND_MATCHCASE, @c SCFIND_WHOLEWORD,
-		///< @c SCFIND_WORDSTART, @c SCFIND_REGEXP or @c SCFIND_POSIX.
-		sptr_t lParam) {			///< The text to search for.
+    unsigned int iMessage,		///< Accepts both @c SCI_SEARCHNEXT and @c SCI_SEARCHPREV.
+    uptr_t wParam,				///< Search modes : @c SCFIND_MATCHCASE, @c SCFIND_WHOLEWORD,
+    ///< @c SCFIND_WORDSTART, @c SCFIND_REGEXP or @c SCFIND_POSIX.
+    sptr_t lParam) {			///< The text to search for.
 
 	const char *txt = CharPtrFromSPtr(lParam);
 	Sci::Position pos = INVALID_POSITION;
@@ -4264,10 +4263,10 @@ void Editor::DropAt(SelectionPosition position, const char *value, size_t length
 	const bool positionWasInSelection = PositionInSelection(position.Position());
 
 	const bool positionOnEdgeOfSelection =
-			(position == SelectionStart()) || (position == SelectionEnd());
+	    (position == SelectionStart()) || (position == SelectionEnd());
 
 	if ((inDragDrop != ddDragging) || !(positionWasInSelection) ||
-					(positionOnEdgeOfSelection && !moving)) {
+	        (positionOnEdgeOfSelection && !moving)) {
 
 		const SelectionPosition selStart = SelectionStart();
 		const SelectionPosition selEnd = SelectionEnd();
@@ -4461,7 +4460,7 @@ void Editor::DwellEnd(bool mouseMoved) {
 void Editor::MouseLeave() {
 	SetHotSpotRange(nullptr);
 	if (!HaveMouseCapture()) {
-		ptMouseLast = Point(-1,-1);
+		ptMouseLast = Point(-1, -1);
 		DwellEnd(true);
 	}
 }
@@ -4816,7 +4815,7 @@ void Editor::ButtonMoveWithModifiers(Point pt, unsigned int, int modifiers) {
 		if (hotspot.Valid() && !PointIsHotspot(pt))
 			SetHotSpotRange(nullptr);
 
-		if (hotSpotClickPos != INVALID_POSITION && PositionFromLocation(pt,true,true) != hotSpotClickPos) {
+		if (hotSpotClickPos != INVALID_POSITION && PositionFromLocation(pt, true, true) != hotSpotClickPos) {
 			if (inDragDrop == ddNone) {
 				DisplayCursor(Window::cursorText);
 			}
@@ -5207,7 +5206,7 @@ void Editor::SetDocPointer(Document *document) {
 	//Platform::DebugPrintf("** %x setdoc to %x\n", pdoc, document);
 	pdoc->RemoveWatcher(this, 0);
 	pdoc->Release();
-	if (document == NULL) {
+	if (!document) {
 		pdoc = new Document(SC_DOCUMENTOPTION_DEFAULT);
 	} else {
 		pdoc = document;
@@ -5410,7 +5409,7 @@ void Editor::EnsureLineVisible(Sci::Line lineDoc, bool enforcePolicy) {
 				SetVerticalScrollPos();
 				Redraw();
 			} else if ((lineDisplay > topLine + LinesOnScreen() - 1) ||
-							((visiblePolicy & VISIBLE_STRICT) && (lineDisplay > topLine + LinesOnScreen() - 1 - visibleSlop))) {
+			        ((visiblePolicy & VISIBLE_STRICT) && (lineDisplay > topLine + LinesOnScreen() - 1 - visibleSlop))) {
 				SetTopLine(std::clamp<Sci::Line>(lineDisplay - LinesOnScreen() + 1 + visibleSlop, 0, MaxScrollPos()));
 				SetVerticalScrollPos();
 				Redraw();
@@ -5491,7 +5490,7 @@ void Editor::FoldChanged(Sci::Line line, int levelNow, int levelPrev) {
 		}
 	}
 	if (!(levelNow & SC_FOLDLEVELWHITEFLAG) &&
-					(LevelNumber(levelPrev) > LevelNumber(levelNow))) {
+	        (LevelNumber(levelPrev) > LevelNumber(levelNow))) {
 		if (pcs->HiddenLines()) {
 			// See if should still be hidden
 			const Sci::Line parentLine = pdoc->GetFoldParent(line);
@@ -5526,7 +5525,7 @@ void Editor::NeedShown(Sci::Position pos, Sci::Position len) {
 }
 
 Sci::Position Editor::GetTag(char *tagValue, int tagNumber) {
-	const char *text = 0;
+	const char *text = nullptr;
 	Sci::Position length = 0;
 	if ((tagNumber >= 1) && (tagNumber <= 9)) {
 		char name[3] = "\\?";
@@ -5933,7 +5932,7 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		// Replacement of the old Scintilla interpretation of EM_LINELENGTH
 	case SCI_LINELENGTH:
 		if ((static_cast<Sci::Position>(wParam) < 0) ||
-						(static_cast<Sci::Position>(wParam) > pdoc->LineFromPosition(pdoc->Length())))
+		        (static_cast<Sci::Position>(wParam) > pdoc->LineFromPosition(pdoc->Length())))
 			return 0;
 		return pdoc->LineStart(static_cast<Sci::Position>(wParam) + 1) - pdoc->LineStart(static_cast<Sci::Position>(wParam));
 
@@ -6376,19 +6375,19 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 
 	case SCI_POSITIONFROMPOINT:
 		return PositionFromLocation(Point::FromInts(static_cast<int>(wParam) - vs.ExternalMarginWidth(), static_cast<int>(lParam)),
-							false, false);
+					    false, false);
 
 	case SCI_POSITIONFROMPOINTCLOSE:
 		return PositionFromLocation(Point::FromInts(static_cast<int>(wParam) - vs.ExternalMarginWidth(), static_cast<int>(lParam)),
-							true, false);
+					    true, false);
 
 	case SCI_CHARPOSITIONFROMPOINT:
 		return PositionFromLocation(Point::FromInts(static_cast<int>(wParam) - vs.ExternalMarginWidth(), static_cast<int>(lParam)),
-							false, true);
+					    false, true);
 
 	case SCI_CHARPOSITIONFROMPOINTCLOSE:
 		return PositionFromLocation(Point::FromInts(static_cast<int>(wParam) - vs.ExternalMarginWidth(), static_cast<int>(lParam)),
-							true, true);
+					    true, true);
 
 	case SCI_GOTOLINE:
 		GoToLine(static_cast<Sci::Line>(wParam));
@@ -6506,15 +6505,15 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 
 	case SCI_CLEARTABSTOPS:
 		if (view.ClearTabstops(static_cast<Sci::Line>(wParam))) {
-			const DocModification mh(SC_MOD_CHANGETABSTOPS, 0, 0, 0, 0, static_cast<Sci::Line>(wParam));
-			NotifyModified(pdoc, mh, NULL);
+			const DocModification mh(SC_MOD_CHANGETABSTOPS, 0, 0, 0, nullptr, static_cast<Sci::Line>(wParam));
+			NotifyModified(pdoc, mh, nullptr);
 		}
 		break;
 
 	case SCI_ADDTABSTOP:
 		if (view.AddTabstop(static_cast<Sci::Line>(wParam), static_cast<int>(lParam))) {
-			const DocModification mh(SC_MOD_CHANGETABSTOPS, 0, 0, 0, 0, static_cast<Sci::Line>(wParam));
-			NotifyModified(pdoc, mh, NULL);
+			const DocModification mh(SC_MOD_CHANGETABSTOPS, 0, 0, 0, nullptr, static_cast<Sci::Line>(wParam));
+			NotifyModified(pdoc, mh, nullptr);
 		}
 		break;
 
@@ -7569,13 +7568,17 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		InvalidateStyleRedraw();
 		break;
 
-	case SCI_SETZOOM:
-		// >>>>>>>>>>>>>>>   BEG NON STD SCI PATCH   >>>>>>>>>>>>>>>
-		vs.zoomLevel = std::clamp(static_cast<int>(wParam), SC_MIN_ZOOM_LEVEL, SC_MAX_ZOOM_LEVEL);
-		// <<<<<<<<<<<<<<<   END NON STD SCI PATCH   <<<<<<<<<<<<<<<
-		InvalidateStyleRedraw();
-		NotifyZoom();
-		break;
+	case SCI_SETZOOM: {
+			// >>>>>>>>>>>>>>>   BEG NON STD SCI PATCH   >>>>>>>>>>>>>>>
+			const int zoomLevel = std::clamp(static_cast<int>(wParam), SC_MIN_ZOOM_LEVEL, SC_MAX_ZOOM_LEVEL);
+			// <<<<<<<<<<<<<<<   END NON STD SCI PATCH   <<<<<<<<<<<<<<<
+			if (zoomLevel != vs.zoomLevel) {
+				vs.zoomLevel = zoomLevel;
+				InvalidateStyleRedraw();
+				NotifyZoom();
+			}
+			break;
+		}
 
 	case SCI_GETZOOM:
 		return vs.zoomLevel;
@@ -8227,7 +8230,6 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 
 	case SCI_COUNTCHARACTERS:
 		return pdoc->CountCharacters(static_cast<Sci::Position>(wParam), lParam);
-		//return pdoc->CountCharacters(static_cast<Sci::Position>(wParam), static_cast<Sci::Position>(lParam));
 
 	case SCI_COUNTCODEUNITS:
 		return pdoc->CountUTF16(static_cast<Sci::Position>(wParam), lParam);
diff --git a/scintilla/src/PositionCache.cxx b/scintilla/src/PositionCache.cxx
index ef26d236e..c5063ca10 100644
--- a/scintilla/src/PositionCache.cxx
+++ b/scintilla/src/PositionCache.cxx
@@ -494,13 +494,14 @@ SpecialRepresentations::SpecialRepresentations() {
 }
 
 void SpecialRepresentations::SetRepresentation(const char *charBytes, const char *value) {
-	MapRepresentation::iterator it = mapReprs.find(KeyFromString(charBytes, UTF8MaxBytes));
+	const unsigned int key = KeyFromString(charBytes, UTF8MaxBytes);
+	MapRepresentation::iterator it = mapReprs.find(key);
 	if (it == mapReprs.end()) {
 		// New entry so increment for first byte
 		const unsigned char ucStart = charBytes[0];
 		startByteHasReprs[ucStart]++;
 	}
-	mapReprs[KeyFromString(charBytes, UTF8MaxBytes)] = Representation(value);
+	mapReprs[key] = Representation(value);
 }
 
 void SpecialRepresentations::ClearRepresentation(const char *charBytes) {
diff --git a/scintilla/version.txt b/scintilla/version.txt
index 617de7eae..ddabef86a 100644
--- a/scintilla/version.txt
+++ b/scintilla/version.txt
@@ -1 +1 @@
-411
+412

From c32072882db05dbd0b9cc0ff0248100f5724eb9a Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Wed, 3 Oct 2018 14:45:25 +0200
Subject: [PATCH 2/2] + chg: changed initial factory defaults for some settings
 + minor bug fixes

---
 src/Edit.c                         |  24 +++++++-----------------
 src/Edit.h                         |   9 ++++++---
 src/Encoding.c                     |   4 ++--
 src/Notepad3.c                     |  14 +++++++-------
 src/SciCall.h                      |   2 ++
 src/StyleLexers/styleLexStandard.c |  12 ++++++------
 src/Version.h                      | Bin 12936 -> 12948 bytes
 7 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/src/Edit.c b/src/Edit.c
index a997d3bce..b2986e8e3 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -52,7 +52,7 @@
 #include "SciCall.h"
 #include "scilexer.h"
 
-#include "edit.h"
+#include "Edit.h"
 
 
 #ifndef LCMAP_TITLECASE
@@ -6307,12 +6307,14 @@ void EditClearAllOccurrenceMarkers(HWND hwnd)
   {
     _IGNORE_NOTIFY_CHANGE_;
 
-    SendMessage(hwnd, SCI_SETINDICATORCURRENT, INDIC_NP3_MARK_OCCURANCE, 0);
-    SendMessage(hwnd, SCI_INDICATORCLEARRANGE, 0, SciCall_GetTextLength());
+    SciCall_SetIndicatorCurrent(INDIC_NP3_MARK_OCCURANCE);
+    SciCall_IndicatorClearRange(0, SciCall_GetTextLength());
     _DeleteLineStateAll(LINESTATE_OCCURRENCE_MARK);
-    g_iMarkOccurrencesCount = (Settings.MarkOccurrences > 0) ? 0 : -1;
+    EditFinalizeStyling(hwnd, -1);
 
     _OBSERVE_NOTIFY_CHANGE_;
+
+    g_iMarkOccurrencesCount = (Settings.MarkOccurrences > 0) ? 0 : -1;
   }
 }
 
@@ -6448,7 +6450,7 @@ void EditMarkAll(HWND hwnd, char* pszFind, int flags, DocPos rangeStart, DocPos
     DocPos start = rangeStart;
     DocPos end = rangeEnd;
 
-    SendMessage(hwnd, SCI_SETINDICATORCURRENT, INDIC_NP3_MARK_OCCURANCE, 0);
+    SciCall_SetIndicatorCurrent(INDIC_NP3_MARK_OCCURANCE);
     
     g_iMarkOccurrencesCount = 0;
     DocPos iPos = (DocPos)-1;
@@ -6899,18 +6901,6 @@ static bool  _HighlightIfBrace(HWND hwnd, DocPos iPos)
 }
 
 
-//=============================================================================
-//
-//  EditApplyLexerStyle()
-//  if iRangeEnd == -1 : apply style from iRangeStart to document end
-//
-void EditApplyLexerStyle(HWND hwnd, DocPos iRangeStart, DocPos iRangeEnd)
-{
-  UNUSED(hwnd);
-  SciCall_Colourise(iRangeStart, iRangeEnd);
-}
-
-
 //=============================================================================
 //
 //  EditFinalizeStyling()
diff --git a/src/Edit.h b/src/Edit.h
index 3bcb8bbe6..1970a1d3e 100644
--- a/src/Edit.h
+++ b/src/Edit.h
@@ -17,6 +17,7 @@
 #define _NP3_EDIT_H_
 
 #include "Scintilla.h"
+#include "SciCall.h"
 #include "TypeDefs.h"
 
 // extern "C" declarations of Scintilla functions
@@ -107,15 +108,17 @@ void  EditSetAccelWordNav(HWND,bool);
 bool  EditAutoCompleteWord(HWND,bool);
 void  EditGetBookmarkList(HWND,LPWSTR,int);
 void  EditSetBookmarkList(HWND,LPCWSTR);
-void  EditApplyLexerStyle(HWND, DocPos, DocPos);
 void  EditFinalizeStyling(HWND, DocPos);
 
 void  EditMarkAllOccurrences(HWND hwnd, bool bForceClear);
 void  EditUpdateVisibleUrlHotspot(bool);
 void  EditHideNotMarkedLineRange(HWND, DocPos, DocPos, bool);
 
-//void SciInitThemes(HWND);
-//LRESULT CALLBACK SciThemedWndProc(HWND,UINT,WPARAM,LPARAM);
+//  if iRangeEnd == -1 : apply style from iRangeStart to document end
+inline void EditApplyLexerStyle(HWND hwnd, const DocPos iRangeStart, const DocPos iRangeEnd) {
+  (void)(hwnd); SciCall_Colourise(iRangeStart, iRangeEnd);
+}
+
 
 #define FV_TABWIDTH        1
 #define FV_INDENTWIDTH     2
diff --git a/src/Encoding.c b/src/Encoding.c
index 75c4343da..310de81f4 100644
--- a/src/Encoding.c
+++ b/src/Encoding.c
@@ -6,8 +6,8 @@
 * Encoding.c                                                                  *
 *   Handling and Helpers for File Encoding                                    *
 *   Based on code from Notepad2, (c) Florian Balmer 1996-2011                 *
-*	                                                                            *
-*	                                                                            *
+*                                                                             *
+*                                                                             *
 *                                                                             *
 *                                                  (c) Rizonesoft 2015-2018   *
 *                                                    https://rizonesoft.com   *
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 395ad7f9d..bfe84ae94 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -6722,7 +6722,7 @@ void LoadSettings()
     Settings.EFR_Data.bTransformBS = IniSectionGetBool(pIniSection, L"FindTransformBS", Defaults.EFR_Data.bTransformBS);
     Defaults.EFR_Data.bWildcardSearch = false;
     Settings.EFR_Data.bWildcardSearch = IniSectionGetBool(pIniSection, L"WildcardSearch", Defaults.EFR_Data.bWildcardSearch);
-    Defaults.EFR_Data.bMarkOccurences = false;
+    Defaults.EFR_Data.bMarkOccurences = true;
     Settings.EFR_Data.bMarkOccurences = IniSectionGetBool(pIniSection, L"FindMarkAllOccurrences", Defaults.EFR_Data.bMarkOccurences);
     Defaults.EFR_Data.bHideNonMatchedLines = false;
     Settings.EFR_Data.bHideNonMatchedLines = IniSectionGetBool(pIniSection, L"HideNonMatchedLines", Defaults.EFR_Data.bHideNonMatchedLines);
@@ -6753,17 +6753,17 @@ void LoadSettings()
     GET_INT_VALUE_FROM_INISECTION(PathNameFormat, 1, 0, 2);
     GET_BOOL_VALUE_FROM_INISECTION(WordWrap, false);  g_bWordWrapG = Settings.WordWrap;
     GET_INT_VALUE_FROM_INISECTION(WordWrapMode, 0, 0, 1);
-    GET_INT_VALUE_FROM_INISECTION(WordWrapIndent, 0, 0, 6);
+    GET_INT_VALUE_FROM_INISECTION(WordWrapIndent, 2, 0, 6);
 
     Defaults.WordWrapSymbols = 22;
-    int iWS = IniSectionGetInt(pIniSection, L"WordWrapSymbols", Defaults.WordWrapSymbols);
+    int const iWS = IniSectionGetInt(pIniSection, L"WordWrapSymbols", Defaults.WordWrapSymbols);
     Settings.WordWrapSymbols = clampi(iWS % 10, 0, 2) + clampi((iWS % 100 - iWS % 10) / 10, 0, 2) * 10;
     
-    GET_BOOL_VALUE_FROM_INISECTION(ShowWordWrapSymbols, false);
+    GET_BOOL_VALUE_FROM_INISECTION(ShowWordWrapSymbols, true);
     GET_BOOL_VALUE_FROM_INISECTION(MatchBraces, true);
     GET_BOOL_VALUE_FROM_INISECTION(AutoCloseTags, false);
-    GET_BOOL_VALUE_FROM_INISECTION(HighlightCurrentLine, false);
-    GET_BOOL_VALUE_FROM_INISECTION(HyperlinkHotspot, false);
+    GET_BOOL_VALUE_FROM_INISECTION(HighlightCurrentLine, true);
+    GET_BOOL_VALUE_FROM_INISECTION(HyperlinkHotspot, true);
     GET_BOOL_VALUE_FROM_INISECTION(ScrollPastEOF, false);
     GET_BOOL_VALUE_FROM_INISECTION(AutoIndent, true);
     GET_BOOL_VALUE_FROM_INISECTION(AutoCompleteWords, false);
@@ -6784,7 +6784,7 @@ void LoadSettings()
     GET_INT_VALUE_FROM_INISECTION(MarkOccurrences, 1, 0, 3);
     GET_BOOL_VALUE_FROM_INISECTION(MarkOccurrencesMatchVisible, false);
     GET_BOOL_VALUE_FROM_INISECTION(MarkOccurrencesMatchCase, false);
-    GET_BOOL_VALUE_FROM_INISECTION(MarkOccurrencesMatchWholeWords, false);
+    GET_BOOL_VALUE_FROM_INISECTION(MarkOccurrencesMatchWholeWords, true);
 
     Defaults.MarkOccurrencesCurrentWord = !Defaults.MarkOccurrencesMatchWholeWords;
     Settings.MarkOccurrencesCurrentWord = IniSectionGetBool(pIniSection, L"MarkOccurrencesCurrentWord", Defaults.MarkOccurrencesCurrentWord);
diff --git a/src/SciCall.h b/src/SciCall.h
index 7a405349a..765a7d40d 100644
--- a/src/SciCall.h
+++ b/src/SciCall.h
@@ -388,8 +388,10 @@ DeclareSciCallR0(GetMaxLineState, GETMAXLINESTATE, DocLn)
 //
 //  Indicators
 //
+DeclareSciCallV1(SetIndicatorCurrent, SETINDICATORCURRENT, int, indicatorID)
 DeclareSciCallR2(IndicatorValueAt, INDICATORVALUEAT, int, int, indicatorID, DocPos, position)
 DeclareSciCallV2(IndicatorFillRange, INDICATORFILLRANGE, DocPos, position, DocPos, length)
+DeclareSciCallV2(IndicatorClearRange, INDICATORCLEARRANGE, DocPos, position, DocPos, length)
 
 
 //=============================================================================
diff --git a/src/StyleLexers/styleLexStandard.c b/src/StyleLexers/styleLexStandard.c
index c576fb807..f384e16f7 100644
--- a/src/StyleLexers/styleLexStandard.c
+++ b/src/StyleLexers/styleLexStandard.c
@@ -35,13 +35,13 @@ EDITLEXER lexStandard = {
 SCLEX_NULL, IDS_LEX_DEF_TXT, L"Default Text", L"txt; text; wtx; log; asc; doc", L"", 
 &StdLexFunction, // static
 &KeyWords_NULL, {
-    /*  0 */ { STYLE_DEFAULT, IDS_LEX_STD_STYLE, L"Default Style", L"font:Default; size:10", L"" },
-    /*  1 */ { STYLE_LINENUMBER, IDS_LEX_STD_MARGIN, L"Margins and Line Numbers", L"size:-2; fore:#FF0000", L"" },
-    /*  2 */ { STYLE_BRACELIGHT, IDS_LEX_STD_BRACE, L"Matching Braces (Indicator)", L"fore:#00FF40; alpha:40; alpha2:40; indic_roundbox", L"" },
+    /*  0 */ { STYLE_DEFAULT, IDS_LEX_STD_STYLE, L"Default Style", L"font:Default; size:11", L"" },
+    /*  1 */ { STYLE_LINENUMBER, IDS_LEX_STD_MARGIN, L"Margins and Line Numbers", L"size:-2; fore:#008080", L"" },
+    /*  2 */ { STYLE_BRACELIGHT, IDS_LEX_STD_BRACE, L"Matching Braces (Indicator)", L"fore:#00FF40; alpha:80; alpha2:80; indic_roundbox", L"" },
     /*  3 */ { STYLE_BRACEBAD, IDS_LEX_STD_BRACE_FAIL, L"Matching Braces Error (Indicator)", L"fore:#FF0080; alpha:140; alpha2:140; indic_roundbox", L"" },
     /*  4 */ { STYLE_CONTROLCHAR, IDS_LEX_STD_CTRL_CHAR, L"Control Characters (Font)", L"size:-1", L"" },
     /*  5 */ { STYLE_INDENTGUIDE, IDS_LEX_STD_INDENT, L"Indentation Guide (Color)", L"fore:#A0A0A0", L"" },
-    /*  6 */ { SCI_SETSELFORE+SCI_SETSELBACK, IDS_LEX_STD_SEL, L"Selected Text (Colors)", L"back:#0A246A; eolfilled; alpha:95", L"" },
+    /*  6 */ { SCI_SETSELFORE+SCI_SETSELBACK, IDS_LEX_STD_SEL, L"Selected Text (Colors)", L"back:#4040FF; eolfilled; alpha:80", L"" },
     /*  7 */ { SCI_SETWHITESPACEFORE+SCI_SETWHITESPACEBACK+SCI_SETWHITESPACESIZE, IDS_LEX_STD_WSPC, L"Whitespace (Colors, Size 0-12)", L"fore:#FF4000", L"" },
     /*  8 */ { SCI_SETCARETLINEBACK, IDS_LEX_STD_LN_BACKGR, L"Current Line Background (Color)", L"back:#FFFF00; alpha:50", L"" },
     /*  9 */ { SCI_SETCARETFORE+SCI_SETCARETWIDTH, IDS_LEX_STD_CARET, L"Caret (Color, Size 1-3)", L"", L"" },
@@ -58,8 +58,8 @@ EDITLEXER lexStandard2nd = {
 SCLEX_NULL, IDS_LEX_STR_63266, L"2nd Default Text", L"txt; text; wtx; log; asc; doc", L"", 
 &Std2ndLexFunction, // static
 &KeyWords_NULL,{
-    /*  0 */ { STYLE_DEFAULT, IDS_LEX_2ND_STYLE, L"2nd Default Style", L"font:Courier New; size:10", L"" },
-    /*  1 */ { STYLE_LINENUMBER, IDS_LEX_2ND_MARGIN, L"2nd Margins and Line Numbers", L"font:Tahoma; size:-2; fore:#FF0000", L"" },
+    /*  0 */ { STYLE_DEFAULT, IDS_LEX_2ND_STYLE, L"2nd Default Style", L"font:Courier New; size:11", L"" },
+    /*  1 */ { STYLE_LINENUMBER, IDS_LEX_2ND_MARGIN, L"2nd Margins and Line Numbers", L"font:Courier New; size:-2; fore:#008080", L"" },
     /*  2 */ { STYLE_BRACELIGHT, IDS_LEX_2ND_BRACE, L"2nd Matching Braces (Indicator)", L"fore:#00FF40; alpha:80; alpha2:220; indic_roundbox", L"" },
     /*  3 */ { STYLE_BRACEBAD, IDS_LEX_2ND_BRACE_FAIL, L"2nd Matching Braces Error (Indicator)", L"fore:#FF0080; alpha:140; alpha2:220; indic_roundbox", L"" },
     /*  4 */ { STYLE_CONTROLCHAR, IDS_LEX_2ND_CTRL_CHAR, L"2nd Control Characters (Font)", L"size:-1", L"" },
diff --git a/src/Version.h b/src/Version.h
index 4d82e865e81a851eadf60ceb3bdedd826e13f722..11bb533398e177e5789c30bbd26354062822a045 100644
GIT binary patch
delta 32
ocmeB3oszmCM|9!=mdSlWBAXjTS1?WfBo#E-L6U28jRcPr0NfP|`Tzg`

delta 21
ccmbP|+L5{;M|5+6=pLrYEvhn`10-Ce0Ae=>-v9sr