Merge pull request #704 from RaiKoHoff/Dev_1003

Scintilla update and changed initial default settings

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

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,16 +42,16 @@ <h2>
       containing very few restrictions.
     </p>
     <h3>
-       Release 4.1.1
+       Release 4.1.2
     </h3>
     <h4>
        Source Code
     </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>

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>

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>

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)