diff -Nru scite-4.1.0/debian/changelog scite-4.1.2/debian/changelog
--- scite-4.1.0/debian/changelog	2018-06-19 21:02:30.000000000 +0000
+++ scite-4.1.2/debian/changelog	2018-10-02 12:50:26.000000000 +0000
@@ -1,3 +1,22 @@
+scite (4.1.2-1) unstable; urgency=medium
+
+  [ Andreas Rönnquist ]
+  * New upstream version 4.1.2
+    - Fixes povray syntax on Linux (Closes: #587229)
+
+  [ Ondřej Nový ]
+  * d/watch: Use https protocol
+
+ -- Andreas Rönnquist <gusnan@debian.org>  Tue, 02 Oct 2018 14:50:26 +0200
+
+scite (4.1.1-1) unstable; urgency=medium
+
+  * New upstream version 4.1.1
+  * Update standards version to 4.2.1, no changes required
+  * Remove empty tests (Closes: #907597)
+
+ -- Andreas Rönnquist <gusnan@debian.org>  Sun, 09 Sep 2018 13:35:49 +0200
+
 scite (4.1.0-1) unstable; urgency=medium
 
   * New upstream version 4.1.0
diff -Nru scite-4.1.0/debian/control scite-4.1.2/debian/control
--- scite-4.1.0/debian/control	2018-06-19 15:10:47.000000000 +0000
+++ scite-4.1.2/debian/control	2018-10-02 12:50:26.000000000 +0000
@@ -8,7 +8,7 @@
                libgtk-3-dev,
                libglib2.0-dev,
                liblua5.3-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/debian/scite
 Vcs-Git: https://salsa.debian.org/debian/scite.git
 Homepage: http://scintilla.org/SciTE.html
diff -Nru scite-4.1.0/debian/tests/control scite-4.1.2/debian/tests/control
--- scite-4.1.0/debian/tests/control	2018-06-19 13:50:34.000000000 +0000
+++ scite-4.1.2/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-# Test installability
-Depends: @
-Test-Command: /bin/true
diff -Nru scite-4.1.0/debian/watch scite-4.1.2/debian/watch
--- scite-4.1.0/debian/watch	2018-06-19 13:50:34.000000000 +0000
+++ scite-4.1.2/debian/watch	2018-10-02 12:50:26.000000000 +0000
@@ -2,4 +2,4 @@
 # qa.debian.org runs a redirector which allows a simpler form of URL
 # for SourceForge based projects. The format below will automatically
 # be rewritten to use the redirector.
-http://sf.net/scintilla/scite(\d)(\d)(\d)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+https://sf.net/scintilla/scite(\d)(\d)(\d)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
diff -Nru scite-4.1.0/scintilla/cocoa/ScintillaFramework/Info.plist scite-4.1.2/scintilla/cocoa/ScintillaFramework/Info.plist
--- scite-4.1.0/scintilla/cocoa/ScintillaFramework/Info.plist	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/cocoa/ScintillaFramework/Info.plist	2018-10-02 01:35:40.000000000 +0000
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.1.0</string>
+	<string>4.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.1.0</string>
+	<string>4.1.2</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff -Nru scite-4.1.0/scintilla/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj scite-4.1.2/scintilla/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj
--- scite-4.1.0/scintilla/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj	2018-04-10 01:38:39.000000000 +0000
+++ scite-4.1.2/scintilla/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj	2018-09-09 09:00:12.000000000 +0000
@@ -227,6 +227,8 @@
 		8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
 		8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
 		F437405F9F32C7DEFCA38C11 /* LexIndent.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 282E41F3B9E2BFEDD6A05BE7 /* LexIndent.cxx */; };
+		FDC7442CAD70B9A67EF1639D /* LexSAS.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A95147A1AB7CADB00DAFE724 /* LexSAS.cxx */; };
+		5F804AA6B60FE695863A39FE /* LexStata.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 7623427695416AB1270EE023 /* LexStata.cxx */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -457,6 +459,8 @@
 		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8DC2EF5B0486A6940098B216 /* Scintilla.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Scintilla.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+		A95147A1AB7CADB00DAFE724 /* LexSAS.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexSAS.cxx; path = ../../lexers/LexSAS.cxx; sourceTree = SOURCE_ROOT; };
+		7623427695416AB1270EE023 /* LexStata.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexStata.cxx; path = ../../lexers/LexStata.cxx; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -640,6 +644,7 @@
 				28A7D6041995E47D0062D204 /* LexRegistry.cxx */,
 				114B6EFB11FA7526004FB6AB /* LexRuby.cxx */,
 				1160E0371803651C00BCEBCB /* LexRust.cxx */,
+				A95147A1AB7CADB00DAFE724 /* LexSAS.cxx */,
 				114B6EFC11FA7526004FB6AB /* LexScriptol.cxx */,
 				114B6EFD11FA7526004FB6AB /* LexSmalltalk.cxx */,
 				114B6EFE11FA7526004FB6AB /* LexSML.cxx */,
@@ -647,6 +652,7 @@
 				114B6F0011FA7526004FB6AB /* LexSpecman.cxx */,
 				114B6F0111FA7526004FB6AB /* LexSpice.cxx */,
 				114B6F0211FA7526004FB6AB /* LexSQL.cxx */,
+				7623427695416AB1270EE023 /* LexStata.cxx */,
 				11FDAEB6174E1A9700FA161B /* LexSTTXT.cxx */,
 				114B6F0311FA7526004FB6AB /* LexTACL.cxx */,
 				114B6F0411FA7526004FB6AB /* LexTADS3.cxx */,
@@ -1112,6 +1118,8 @@
 				11FF3FE21810EB3900E13F13 /* LexDMAP.cxx in Sources */,
 				F437405F9F32C7DEFCA38C11 /* LexIndent.cxx in Sources */,
 				3D994BD7A5EAC4FA5B3CFBDF /* LexMaxima.cxx in Sources */,
+				FDC7442CAD70B9A67EF1639D /* LexSAS.cxx in Sources */,
+				5F804AA6B60FE695863A39FE /* LexStata.cxx in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff -Nru scite-4.1.0/scintilla/cocoa/ScintillaView.mm scite-4.1.2/scintilla/cocoa/ScintillaView.mm
--- scite-4.1.0/scintilla/cocoa/ScintillaView.mm	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/cocoa/ScintillaView.mm	2018-09-09 09:00:12.000000000 +0000
@@ -1195,7 +1195,7 @@
 
 		path = [bundle pathForResource: @"mac_cursor_flipped" ofType: @"tiff" inDirectory: nil];
 		image = [[NSImage alloc] initWithContentsOfFile: path];
-		reverseArrowCursor = [[NSCursor alloc] initWithImage: image hotSpot: NSMakePoint(12, 2)];
+		reverseArrowCursor = [[NSCursor alloc] initWithImage: image hotSpot: NSMakePoint(15, 2)];
 	}
 }
 
diff -Nru scite-4.1.0/scintilla/cppcheck.suppress scite-4.1.2/scintilla/cppcheck.suppress
--- scite-4.1.0/scintilla/cppcheck.suppress	2018-04-20 03:39:38.000000000 +0000
+++ scite-4.1.2/scintilla/cppcheck.suppress	2018-10-02 01:35:40.000000000 +0000
@@ -30,6 +30,7 @@
 variableScope:scintilla/lexers/LexGui4Cli.cxx
 variableScope:scintilla/lexers/LexInno.cxx
 variableScope:scintilla/lexers/LexLaTeX.cxx
+copyCtorAndEqOperator:scintilla/lexers/LexLaTeX.cxx
 variableScope:scintilla/lexers/LexMetapost.cxx
 variableScope:scintilla/lexers/LexModula.cxx
 variableScope:scintilla/lexers/LexNimrod.cxx
diff -Nru scite-4.1.0/scintilla/doc/index.html scite-4.1.2/scintilla/doc/index.html
--- scite-4.1.0/scintilla/doc/index.html	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/doc/index.html	2018-10-02 01:35:40.000000000 +0000
@@ -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="20180619" />
+    <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.0<br />
-           Site last modified June 19 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,10 +72,11 @@
       </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>
       <li>Version 4.0.4 adds a lexer for Maxima.</li>
-      <li>Version 4.0.3 adds an option to not allocate any memory for styles.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
@@ -110,8 +111,8 @@
        colours and multiple fonts.
     </p>
     <p>
-       Current development occurs on the default branch as 4.0.x which is unstable - interfaces may change before being
-       declared stable in a future 4.1.0. 4.* requires a recent C++ compiler that supports C++14 and some of C++17.
+       Current development occurs on the default branch as 4.* which requires a recent
+       C++ compiler that supports C++17.
     </p>
     <p>
        For projects that need to work with older systems, a LongTerm3 branch is available which uses only features from C++11.
diff -Nru scite-4.1.0/scintilla/doc/ScintillaDoc.html scite-4.1.2/scintilla/doc/ScintillaDoc.html
--- scite-4.1.0/scintilla/doc/ScintillaDoc.html	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/doc/ScintillaDoc.html	2018-10-02 01:35:40.000000000 +0000
@@ -270,136 +270,140 @@
         <tr>
           <td>&cir; <a class="toc" href="#SelectionAndInformation">Selection and information</a></td>
 
-          <td>&cir; <a class="toc" href="#MultipleSelectionAndVirtualSpace">Multiple Selection and Virtual Space</a></td>
+          <td>&cir; <a class="toc" href="#ByCharacterOrCodeUnit">By character or UTF-16 code unit</a></td>
 
-          <td>&cir; <a class="toc" href="#ScrollingAndAutomaticScrolling">Scrolling and automatic
+          <td>&cir; <a class="toc" href="#MultipleSelectionAndVirtualSpace">Multiple Selection and Virtual Space</a></td>
           scrolling</a></td>
 
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#ScrollingAndAutomaticScrolling">Scrolling and automatic
+
           <td>&cir; <a class="toc" href="#WhiteSpace">White space</a></td>
 
           <td>&cir; <a class="toc" href="#Cursor">Cursor</a></td>
 
-          <td>&cir; <a class="toc" href="#MouseCapture">Mouse capture</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#MouseCapture">Mouse capture</a></td>
+
           <td>&cir; <a class="toc" href="#LineEndings">Line endings</a></td>
 
           <td>&cir; <a class="toc" href="#Words">Words</a></td>
 
-          <td>&cir; <a class="toc" href="#Styling">Styling</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#Styling">Styling</a></td>
+
           <td>&cir; <a class="toc" href="#StyleDefinition">Style definition</a></td>
 
           <td>&cir; <a class="toc" href="#CaretAndSelectionStyles">Caret, selection, and hotspot styles</a></td>
 
-          <td>&cir; <a class="toc" href="#CharacterRepresentations">Character representations</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#CharacterRepresentations">Character representations</a></td>
+
           <td>&cir; <a class="toc" href="#Margins">Margins</a></td>
 
           <td>&cir; <a class="toc" href="#Annotations">Annotations</a></td>
 
-          <td>&cir; <a class="toc" href="#OtherSettings">Other settings</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#OtherSettings">Other settings</a></td>
+
           <td>&cir; <a class="toc" href="#BraceHighlighting">Brace highlighting</a></td>
 
           <td>&cir; <a class="toc" href="#TabsAndIndentationGuides">Tabs and Indentation
           Guides</a></td>
 
-          <td>&cir; <a class="toc" href="#Markers">Markers</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#Markers">Markers</a></td>
+
           <td>&cir; <a class="toc" href="#Indicators">Indicators</a></td>
 
           <td>&cir; <a class="toc" href="#Autocompletion">Autocompletion</a></td>
 
-          <td>&cir; <a class="toc" href="#UserLists">User lists</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#UserLists">User lists</a></td>
+
           <td>&cir; <a class="toc" href="#CallTips">Call tips</a></td>
 
           <td>&cir; <a class="toc" href="#KeyboardCommands">Keyboard commands</a></td>
 
-          <td>&cir; <a class="toc" href="#KeyBindings">Key bindings</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#KeyBindings">Key bindings</a></td>
+
           <td>&cir; <a class="toc" href="#PopupEditMenu">Popup edit menu</a></td>
 
           <td>&cir; <a class="toc" href="#MacroRecording">Macro recording</a></td>
 
-          <td>&cir; <a class="toc" href="#Printing">Printing</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#Printing">Printing</a></td>
+
           <td>&cir; <a class="toc" href="#DirectAccess">Direct access</a></td>
 
           <td>&cir; <a class="toc" href="#MultipleViews">Multiple views</a></td>
 
-          <td>&cir; <a class="toc" href="#BackgroundLoadSave">Background loading and saving</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#BackgroundLoadSave">Background loading and saving</a></td>
+
           <td>&cir; <a class="toc" href="#Folding">Folding</a></td>
 
           <td>&cir; <a class="toc" href="#LineWrapping">Line wrapping</a></td>
 
-          <td>&cir; <a class="toc" href="#Zooming">Zooming</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#Zooming">Zooming</a></td>
+
           <td>&cir; <a class="toc" href="#LongLines">Long lines</a></td>
 
           <td>&cir; <a class="toc" href="#Accessibility">Accessibility</a></td>
 
-          <td>&cir; <a class="toc" href="#Lexer">Lexer</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#Lexer">Lexer</a></td>
+
           <td>&cir; <a class="toc" href="#LexerObjects">Lexer objects</a></td>
 
           <td>&cir; <a class="toc" href="#Notifications">Notifications</a></td>
 
-          <td>&cir; <a class="toc" href="#Images">Images</a></td>
-
         </tr>
 
         <tr>
+          <td>&cir; <a class="toc" href="#Images">Images</a></td>
+
           <td>&cir; <a class="toc" href="#GTK">GTK+</a></td>
 
           <td>&cir; <a class="toc" href="#ProvisionalMessages"><span class="provisional">Provisional messages</span></a></td>
 
-          <td>&cir; <a class="toc" href="#DeprecatedMessages">Deprecated messages</a></td>
-
         </tr>
         <tr>
+          <td>&cir; <a class="toc" href="#DeprecatedMessages">Deprecated messages</a></td>
+
           <td>&cir; <a class="toc" href="#EditMessagesNeverSupportedByScintilla">Edit messages never
           supported by Scintilla</a></td>
 
           <td>&cir; <a class="toc" href="#RemovedFeatures">Removed features</a></td>
 
+        </tr>
+        <tr>
           <td>&cir; <a class="toc" href="#BuildingScintilla">Building Scintilla</a></td>
 
         </tr>
@@ -1229,8 +1233,6 @@
      <a class="message" href="#SCI_MOVECARETINSIDEVIEW">SCI_MOVECARETINSIDEVIEW</a><br />
      <a class="message" href="#SCI_POSITIONBEFORE">SCI_POSITIONBEFORE(int pos) &rarr; position</a><br />
      <a class="message" href="#SCI_POSITIONAFTER">SCI_POSITIONAFTER(int pos) &rarr; position</a><br />
-     <a class="message" href="#SCI_POSITIONRELATIVE">SCI_POSITIONRELATIVE(int pos, int relative) &rarr; position</a><br />
-     <a class="message" href="#SCI_COUNTCHARACTERS">SCI_COUNTCHARACTERS(int start, int end) &rarr; int</a><br />
      <a class="message" href="#SCI_TEXTWIDTH">SCI_TEXTWIDTH(int style, const char *text) &rarr; int</a><br />
      <a class="message" href="#SCI_TEXTHEIGHT">SCI_TEXTHEIGHT(int line) &rarr; int</a><br />
      <a class="message" href="#SCI_CHOOSECARETX">SCI_CHOOSECARETX</a><br />
@@ -1448,15 +1450,6 @@
      If called with a position within a multi byte character will return the position
      of the start/end of that character.</p>
 
-    <p><b id="SCI_POSITIONRELATIVE">SCI_POSITIONRELATIVE(int pos, int relative) &rarr; position</b><br />
-     Count a number of whole characters before or after the argument position and return that position.
-     The minimum position returned is 0 and the maximum is the last position in the document.
-     If the position goes past the document end then 0 is returned.
-     </p>
-
-    <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_TEXTWIDTH">SCI_TEXTWIDTH(int style, const char *text) &rarr; int</b><br />
      This returns the pixel width of a string drawn in the given <code class="parameter">style</code> which can
     be used, for example, to decide how wide to make the line number margin in order to display a
@@ -1527,6 +1520,61 @@
      When this option is turned off, mouse selections will always stick to the mode the selection was started in. It
      is off by default.</p>
 
+    <h2 id="ByCharacterOrCodeUnit">By character or UTF-16 code unit</h2>
+
+    <p>Most Scintilla APIs use byte positions but some applications want to use positions based on counting
+    (UTF-32) characters or (UTF-16) code units
+    or need to communicate with other code written in terms of characters or code units.
+    With only byte positions, this may require examining many bytes to count characters or code units in the document
+    but this may be sped up in some cases by indexing the line starts by character or code unit.</p>
+
+    <code>
+     <a class="message" href="#SCI_POSITIONRELATIVE">SCI_POSITIONRELATIVE(int pos, int relative) &rarr; position</a><br />
+     <a class="message" href="#SCI_POSITIONRELATIVECODEUNITS">SCI_POSITIONRELATIVECODEUNITS(int pos, int relative) &rarr; position</a><br />
+     <a class="message" href="#SCI_COUNTCHARACTERS">SCI_COUNTCHARACTERS(int start, int end) &rarr; int</a><br />
+     <a class="message" href="#SCI_COUNTCODEUNITS">SCI_COUNTCODEUNITS(int start, int end) &rarr; int</a><br />
+     <a class="message" href="#SCI_GETLINECHARACTERINDEX">SCI_GETLINECHARACTERINDEX &rarr; int</a><br />
+     <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; position</a><br />
+    </code>
+
+    <p><b id="SCI_POSITIONRELATIVE">SCI_POSITIONRELATIVE(int pos, int relative) &rarr; position</b><br />
+     Count a number of whole characters before or after the argument position and return that position.
+     The minimum position returned is 0 and the maximum is the last position in the document.
+     If the position goes past the document end then 0 is returned.
+     </p>
+
+    <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; 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>
+
+    <p><b id="SCI_GETLINECHARACTERINDEX">SCI_GETLINECHARACTERINDEX &rarr; int</b><br />
+     Returns which if any indexes are active. It may be <code>SC_LINECHARACTERINDEX_NONE(0)</code> or one or more
+     of <code>SC_LINECHARACTERINDEX_UTF32(1)</code> if whole characters are indexed or
+     <code>SC_LINECHARACTERINDEX_UTF16(2)</code> if UTF-16 code units are indexed.
+     Character indexes are currently only supported for UTF-8 documents.</p>
+
+    <p><b id="SCI_ALLOCATELINECHARACTERINDEX">SCI_ALLOCATELINECHARACTERINDEX(int lineCharacterIndex)</b><br />
+    <b id="SCI_RELEASELINECHARACTERINDEX">SCI_RELEASELINECHARACTERINDEX(int lineCharacterIndex)</b><br />
+     Allocate or release one or more indexes using same enumeration as <code>SCI_GETLINECHARACTERINDEX</code>.
+     Different aspects of an application may need indexes for different periods and should allocate for those periods.
+     Indexes use additional memory so releasing them can help minimize memory but they also take time to recalculate.
+     Scintilla may also allocate indexes to support features like accessibility or input method editors.
+     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; 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
+     <code>SCI_INDEXPOSITIONFROMLINE</code> with the same <code class="parameter">lineCharacterIndex</code> argument.</p>
+
     <h2 id="MultipleSelectionAndVirtualSpace">Multiple Selection and Virtual Space</h2>
 
     <code>
@@ -3722,6 +3770,9 @@
      <p>The windowed behaviour can be chosen with <code>SCI_SETIMEINTERACTION(SC_IME_WINDOWED)</code>
      and the inline behaviour with <code>SCI_SETIMEINTERACTION(SC_IME_INLINE)</code>.
      Scintilla may ignore this call in some cases. For example, the inline behaviour might only be supported for some languages.</p>
+     <p>When the inline IME mode is active, characters are added tentatively before being finalised and an
+     <a class="message" href="#SCN_CHARADDED">SCN_CHARADDED</a>
+     notification is sent for each character.</p>
 
 <div  class="provisional">
     <a href="#ProvisionalMessages">These bidirectional features are experimental and incomplete.</a><br />
diff -Nru scite-4.1.0/scintilla/doc/ScintillaDownload.html scite-4.1.2/scintilla/doc/ScintillaDownload.html
--- scite-4.1.0/scintilla/doc/ScintillaDownload.html	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/doc/ScintillaDownload.html	2018-10-02 01:35:40.000000000 +0000
@@ -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/scintilla410.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla412.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla410.tgz">
+	<a href="https://www.scintilla.org/scintilla412.tgz">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 4.1.0
+       Release 4.1.2
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@
        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/scintilla410.zip">zip format</a> (1600K) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla410.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 -Nru scite-4.1.0/scintilla/doc/ScintillaHistory.html scite-4.1.2/scintilla/doc/ScintillaHistory.html
--- scite-4.1.0/scintilla/doc/ScintillaHistory.html	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/doc/ScintillaHistory.html	2018-10-02 01:35:40.000000000 +0000
@@ -112,6 +112,8 @@
 	<td>David Clain</td>
 	<td>Brendon Yenson</td>
       </tr><tr>
+	<td>Philipp</td>
+      </tr><tr>
 	<td><a href="http://www.baanboard.com">Vamsi Potluru</a></td>
 	<td>Praveen Ambekar</td>
 	<td>Alan Knowles</td>
@@ -530,6 +532,10 @@
 	<td>Giuseppe Corbelli</td>
 	<td>Andreas Rönnquist</td>
 	<td>Henrik Hank</td>
+	<td>Luke Rasmussen</td>
+      </tr><tr>
+	<td>maboroshin</td>
+	<td>Gokul Krishnan</td>
     </tr>
     </table>
     <p>
@@ -542,6 +548,67 @@
       </li>
     </ul>
     <h3>
+       <a href="https://www.scintilla.org/scite412.zip">Release 4.1.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 2 October 2018.
+	</li>
+	<li>
+	C++ lexer fixes evaluation of "#elif".
+	<a href="https://sourceforge.net/p/scintilla/bugs/2045/">Bug #2045</a>.
+	</li>
+	<li>
+	Markdown lexer fixes highlighting of non-ASCII characters in links.
+	</li>
+	<li>
+	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>
+    <h3>
+       <a href="https://www.scintilla.org/scite411.zip">Release 4.1.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 9 September 2018.
+	</li>
+	<li>
+	Optional indexing of line starts in UTF-8 documents by UTF-32 code points and UTF-16 code units added.
+	This can improve performance for clients that provide UTF-32 or UTF-16 interfaces or that need to interoperate
+	with UTF-32 or UTF-16 components.
+	</li>
+	<li>
+	Lexers added for SAS and Stata.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1185/">Feature #1185.</a>
+	</li>
+	<li>
+	Shell folder folds "if", "do", and "case".
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1144/">Feature #1144.</a>
+	</li>
+	<li>
+	SciTE's menukey feature implemented on Windows.
+	</li>
+	<li>
+	For SciTE on Windows, user defined strip lists are now scrollable.
+	Cursor no longer flickers in edit and combo boxes.
+	Focus in and out events occur for combo boxes.
+	</li>
+	<li>
+	Fix a leak in the bidirectional code on Win32.
+	</li>
+	<li>
+	Fix crash on Win32 when switching technology to default after setting bidirectional mode.
+	</li>
+	<li>
+	Fix margin cursor on Cocoa to point more accurately.
+	</li>
+	<li>
+	Fix SciTE crash on GTK+ when using director interface.
+	</li>
+    </ul>
+    <h3>
        <a href="https://www.scintilla.org/scite410.zip">Release 4.1.0</a>
     </h3>
     <ul>
diff -Nru scite-4.1.0/scintilla/include/Platform.h scite-4.1.2/scintilla/include/Platform.h
--- scite-4.1.0/scintilla/include/Platform.h	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/include/Platform.h	2018-09-09 09:00:12.000000000 +0000
@@ -25,6 +25,7 @@
 #define PLAT_FOX 0
 #define PLAT_CURSES 0
 #define PLAT_TK 0
+#define PLAT_HAIKU 0
 
 #if defined(FOX)
 #undef PLAT_FOX
@@ -38,6 +39,10 @@
 #undef PLAT_CURSES
 #define PLAT_CURSES 1
 
+#elif defined(__HAIKU__)
+#undef PLAT_HAIKU
+#define PLAT_HAIKU 1
+
 #elif defined(SCINTILLA_QT)
 #undef PLAT_QT
 #define PLAT_QT 1
diff -Nru scite-4.1.0/scintilla/include/SciLexer.h scite-4.1.2/scintilla/include/SciLexer.h
--- scite-4.1.0/scintilla/include/SciLexer.h	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/include/SciLexer.h	2018-09-09 09:00:12.000000000 +0000
@@ -136,6 +136,8 @@
 #define SCLEX_EDIFACT 121
 #define SCLEX_INDENT 122
 #define SCLEX_MAXIMA 123
+#define SCLEX_STATA 124
+#define SCLEX_SAS 125
 #define SCLEX_AUTOMATIC 1000
 #define SCE_P_DEFAULT 0
 #define SCE_P_COMMENTLINE 1
@@ -1825,6 +1827,34 @@
 #define SCE_EDI_UNA 6
 #define SCE_EDI_UNH 7
 #define SCE_EDI_BADSEGMENT 8
+#define SCE_STATA_DEFAULT 0
+#define SCE_STATA_COMMENT 1
+#define SCE_STATA_COMMENTLINE 2
+#define SCE_STATA_COMMENTBLOCK 3
+#define SCE_STATA_NUMBER 4
+#define SCE_STATA_OPERATOR 5
+#define SCE_STATA_IDENTIFIER 6
+#define SCE_STATA_STRING 7
+#define SCE_STATA_TYPE 8
+#define SCE_STATA_WORD 9
+#define SCE_STATA_GLOBAL_MACRO 10
+#define SCE_STATA_MACRO 11
+#define SCE_SAS_DEFAULT 0
+#define SCE_SAS_COMMENT 1
+#define SCE_SAS_COMMENTLINE 2
+#define SCE_SAS_COMMENTBLOCK 3
+#define SCE_SAS_NUMBER 4
+#define SCE_SAS_OPERATOR 5
+#define SCE_SAS_IDENTIFIER 6
+#define SCE_SAS_STRING 7
+#define SCE_SAS_TYPE 8
+#define SCE_SAS_WORD 9
+#define SCE_SAS_GLOBAL_MACRO 10
+#define SCE_SAS_MACRO 11
+#define SCE_SAS_MACRO_KEYWORD 12
+#define SCE_SAS_BLOCK_KEYWORD 13
+#define SCE_SAS_MACRO_FUNCTION 14
+#define SCE_SAS_STATEMENT 15
 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */
 
 #endif
diff -Nru scite-4.1.0/scintilla/include/Scintilla.h scite-4.1.2/scintilla/include/Scintilla.h
--- scite-4.1.0/scintilla/include/Scintilla.h	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/include/Scintilla.h	2018-09-09 09:00:12.000000000 +0000
@@ -365,6 +365,7 @@
 #define SCI_GETLINEINDENTPOSITION 2128
 #define SCI_GETCOLUMN 2129
 #define SCI_COUNTCHARACTERS 2633
+#define SCI_COUNTCODEUNITS 2715
 #define SCI_SETHSCROLLBAR 2130
 #define SCI_GETHSCROLLBAR 2131
 #define SC_IV_NONE 0
@@ -753,6 +754,7 @@
 #define SCI_POSITIONBEFORE 2417
 #define SCI_POSITIONAFTER 2418
 #define SCI_POSITIONRELATIVE 2670
+#define SCI_POSITIONRELATIVECODEUNITS 2716
 #define SCI_COPYRANGE 2419
 #define SCI_COPYTEXT 2420
 #define SC_SEL_STREAM 0
@@ -1112,6 +1114,14 @@
 #define SC_BIDIRECTIONAL_R2L 2
 #define SCI_GETBIDIRECTIONAL 2708
 #define SCI_SETBIDIRECTIONAL 2709
+#define SC_LINECHARACTERINDEX_NONE 0
+#define SC_LINECHARACTERINDEX_UTF32 1
+#define SC_LINECHARACTERINDEX_UTF16 2
+#define SCI_GETLINECHARACTERINDEX 2710
+#define SCI_ALLOCATELINECHARACTERINDEX 2711
+#define SCI_RELEASELINECHARACTERINDEX 2712
+#define SCI_LINEFROMINDEXPOSITION 2713
+#define SCI_INDEXPOSITIONFROMLINE 2714
 #endif
 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */
 
diff -Nru scite-4.1.0/scintilla/include/Scintilla.iface scite-4.1.2/scintilla/include/Scintilla.iface
--- scite-4.1.0/scintilla/include/Scintilla.iface	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/include/Scintilla.iface	2018-10-02 01:35:40.000000000 +0000
@@ -862,6 +862,9 @@
 # Count characters between two positions.
 fun int CountCharacters=2633(position start, position end)
 
+# Count code units between two positions.
+fun int CountCodeUnits=2715(position start, position end)
+
 # Show or hide the horizontal scroll bar.
 set void SetHScrollBar=2130(bool visible,)
 # Is the horizontal scroll bar visible?
@@ -1959,6 +1962,11 @@
 # of characters. Returned value is always between 0 and last position in document.
 fun position PositionRelative=2670(position pos, int relative)
 
+# Given a valid document position, return a position that differs in a number
+# of UTF-16 code units. Returned value is always between 0 and last position in document.
+# The result may point half way (2 bytes) inside a non-BMP character.
+fun position PositionRelativeCodeUnits=2716(position pos, int relative)
+
 # Copy a range of text to the clipboard. Positions are clipped into the document.
 fun void CopyRange=2419(position start, position end)
 
@@ -2932,6 +2940,8 @@
 val SCLEX_EDIFACT=121
 val SCLEX_INDENT=122
 val SCLEX_MAXIMA=123
+val SCLEX_STATA=124
+val SCLEX_SAS=125
 
 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
 # value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -4853,6 +4863,38 @@
 val SCE_EDI_UNA=6
 val SCE_EDI_UNH=7
 val SCE_EDI_BADSEGMENT=8
+# Lexical states for SCLEX_STATA
+lex STATA=SCLEX_STATA SCE_STATA_
+val SCE_STATA_DEFAULT=0
+val SCE_STATA_COMMENT=1
+val SCE_STATA_COMMENTLINE=2
+val SCE_STATA_COMMENTBLOCK=3
+val SCE_STATA_NUMBER=4
+val SCE_STATA_OPERATOR=5
+val SCE_STATA_IDENTIFIER=6
+val SCE_STATA_STRING=7
+val SCE_STATA_TYPE=8
+val SCE_STATA_WORD=9
+val SCE_STATA_GLOBAL_MACRO=10
+val SCE_STATA_MACRO=11
+# Lexical states for SCLEX_SAS
+lex SAS=SCLEX_SAS SCE_SAS_
+val SCE_SAS_DEFAULT=0
+val SCE_SAS_COMMENT=1
+val SCE_SAS_COMMENTLINE=2
+val SCE_SAS_COMMENTBLOCK=3
+val SCE_SAS_NUMBER=4
+val SCE_SAS_OPERATOR=5
+val SCE_SAS_IDENTIFIER=6
+val SCE_SAS_STRING=7
+val SCE_SAS_TYPE=8
+val SCE_SAS_WORD=9
+val SCE_SAS_GLOBAL_MACRO=10
+val SCE_SAS_MACRO=11
+val SCE_SAS_MACRO_KEYWORD=12
+val SCE_SAS_BLOCK_KEYWORD=13
+val SCE_SAS_MACRO_FUNCTION=14
+val SCE_SAS_STATEMENT=15
 
 # Events
 
@@ -4903,6 +4945,26 @@
 # Set bidirectional text display state.
 set void SetBidirectional=2709(int bidirectional,)
 
+enu LineCharacterIndexType=SC_LINECHARACTERINDEX_
+val SC_LINECHARACTERINDEX_NONE=0
+val SC_LINECHARACTERINDEX_UTF32=1
+val SC_LINECHARACTERINDEX_UTF16=2
+
+# Retrieve line character index state.
+get int GetLineCharacterIndex=2710(,)
+
+# Request line character index be created or its use count increased.
+fun void AllocateLineCharacterIndex=2711(int lineCharacterIndex,)
+
+# Decrease use count of line character index and remove if 0.
+fun void ReleaseLineCharacterIndex=2712(int lineCharacterIndex,)
+
+# Retrieve the document line containing a position measured in index units.
+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)
+
 cat Deprecated
 
 # Divide each styling byte into lexical class bits (default: 5) and indicator
diff -Nru scite-4.1.0/scintilla/lexers/LexBash.cxx scite-4.1.2/scintilla/lexers/LexBash.cxx
--- scite-4.1.0/scintilla/lexers/LexBash.cxx	2017-10-22 21:48:03.000000000 +0000
+++ scite-4.1.2/scintilla/lexers/LexBash.cxx	2018-09-09 09:00:12.000000000 +0000
@@ -824,6 +824,8 @@
 	int levelCurrent = levelPrev;
 	char chNext = styler[startPos];
 	int styleNext = styler.StyleAt(startPos);
+	char word[8] = { '\0' }; // we're not interested in long words anyway
+	unsigned int wordlen = 0;
 	for (Sci_PositionU i = startPos; i < endPos; i++) {
 		char ch = chNext;
 		chNext = styler.SafeGetCharAt(i + 1);
@@ -840,6 +842,19 @@
 					 && !IsCommentLine(lineCurrent + 1, styler))
 				levelCurrent--;
 		}
+		if (style == SCE_SH_WORD) {
+			if ((wordlen + 1) < sizeof(word))
+				word[wordlen++] = ch;
+			if (styleNext != style) {
+				word[wordlen] = '\0';
+				wordlen = 0;
+				if (strcmp(word, "if") == 0 || strcmp(word, "case") == 0 || strcmp(word, "do") == 0) {
+					levelCurrent++;
+				} else if (strcmp(word, "fi") == 0 || strcmp(word, "esac") == 0 || strcmp(word, "done") == 0) {
+					levelCurrent--;
+				}
+			}
+		}
 		if (style == SCE_SH_OPERATOR) {
 			if (ch == '{') {
 				levelCurrent++;
diff -Nru scite-4.1.0/scintilla/lexers/LexCPP.cxx scite-4.1.2/scintilla/lexers/LexCPP.cxx
--- scite-4.1.0/scintilla/lexers/LexCPP.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/lexers/LexCPP.cxx	2018-10-02 01:35:40.000000000 +0000
@@ -242,7 +242,11 @@
 		return level >= 0 && level < 32;
 	}
 	int maskLevel() const noexcept {
-		return 1 << level;
+		if (level >= 0) {
+			return 1 << level;
+		} else {
+			return 1;
+		}
 	}
 public:
 	LinePPState() : state(0), ifTaken(0), level(-1) {
@@ -1275,7 +1279,7 @@
 							// Ensure only one chosen out of #if .. #elif .. #elif .. #else .. #endif
 							if (!preproc.CurrentIfTaken()) {
 								// Similar to #if
-								std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 2, true);
+								std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 4, true);
 								const bool ifGood = EvaluateExpression(restOfLine, preprocessorDefinitions);
 								if (ifGood) {
 									preproc.InvertCurrentLevel();
diff -Nru scite-4.1.0/scintilla/lexers/LexFortran.cxx scite-4.1.2/scintilla/lexers/LexFortran.cxx
--- scite-4.1.0/scintilla/lexers/LexFortran.cxx	2018-05-06 22:31:51.000000000 +0000
+++ scite-4.1.2/scintilla/lexers/LexFortran.cxx	2018-10-02 01:35:40.000000000 +0000
@@ -481,11 +481,11 @@
 	int levelDeltaNext = 0;
 
 	const unsigned int nComL = 3; // defines how many comment lines should be before they are folded
-	Sci_Position nComColB[nComL];
+	Sci_Position nComColB[nComL] = {};
 	Sci_Position nComColF[nComL] = {};
-	Sci_Position nComCur;
-	bool comLineB[nComL];
-	bool comLineF[nComL];
+	Sci_Position nComCur = 0;
+	bool comLineB[nComL] = {};
+	bool comLineF[nComL] = {};
 	bool comLineCur;
 	Sci_Position nLineTotal = styler.GetLine(styler.Length()-1) + 1;
 	if (foldComment) {
diff -Nru scite-4.1.0/scintilla/lexers/LexMarkdown.cxx scite-4.1.2/scintilla/lexers/LexMarkdown.cxx
--- scite-4.1.0/scintilla/lexers/LexMarkdown.cxx	2017-10-22 21:48:03.000000000 +0000
+++ scite-4.1.2/scintilla/lexers/LexMarkdown.cxx	2018-10-02 01:35:40.000000000 +0000
@@ -145,6 +145,7 @@
                                WordList **, Accessor &styler) {
     Sci_PositionU endPos = startPos + length;
     int precharCount = 0;
+    bool isLinkNameDetecting = false;
     // Don't advance on a new loop iteration and retry at the same position.
     // Useful in the corner case of having to start at the beginning file position
     // in the default state.
@@ -337,6 +338,27 @@
                 ++precharCount;
         }
 
+        // Any link
+        if (sc.state == SCE_MARKDOWN_LINK) {
+            if (sc.Match("](") && sc.GetRelative(-1) != '\\') {
+              sc.Forward(2);
+              isLinkNameDetecting = true;
+            }
+            else if (sc.Match("]:") && sc.GetRelative(-1) != '\\') {
+              sc.Forward(2);
+              sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+            else if (!isLinkNameDetecting && sc.ch == ']' && sc.GetRelative(-1) != '\\') {
+              sc.Forward();
+              sc.SetState(SCE_MARKDOWN_DEFAULT);
+            }
+            else if (isLinkNameDetecting && sc.ch == ')' && sc.GetRelative(-1) != '\\') {
+              sc.Forward();
+              sc.SetState(SCE_MARKDOWN_DEFAULT);
+              isLinkNameDetecting = false;
+            }
+        }
+
         // New state anywhere in doc
         if (sc.state == SCE_MARKDOWN_DEFAULT) {
             if (sc.atLineStart && sc.ch == '#') {
@@ -344,38 +366,16 @@
                 freezeCursor = true;
             }
             // Links and Images
-            if (sc.Match("![") || sc.ch == '[') {
-                Sci_Position i = 0, j = 0, k = 0;
-                Sci_Position len = endPos - sc.currentPos;
-                while (i < len && (sc.GetRelative(++i) != ']' || sc.GetRelative(i - 1) == '\\'))
-                    ;
-                if (sc.GetRelative(i) == ']') {
-                    j = i;
-                    if (sc.GetRelative(++i) == '(') {
-                        while (i < len && (sc.GetRelative(++i) != ')' || sc.GetRelative(i - 1) == '\\'))
-                            ;
-                        if (sc.GetRelative(i) == ')')
-                            k = i;
-                    }
-                    else if (sc.GetRelative(i) == '[' || sc.GetRelative(++i) == '[') {
-                        while (i < len && (sc.GetRelative(++i) != ']' || sc.GetRelative(i - 1) == '\\'))
-                            ;
-                        if (sc.GetRelative(i) == ']')
-                            k = i;
-                    }
-                }
-                // At least a link text
-                if (j) {
-                    sc.SetState(SCE_MARKDOWN_LINK);
-                    sc.Forward(j);
-                    // Also has a URL or reference portion
-                    if (k)
-                        sc.Forward(k - j);
-                    sc.ForwardSetState(SCE_MARKDOWN_DEFAULT);
-                }
+            if (sc.Match("![")) {
+              sc.SetState(SCE_MARKDOWN_LINK);
+              sc.Forward(2);
+            }
+            else if (sc.ch == '[' && sc.GetRelative(-1) != '\\') {
+              sc.SetState(SCE_MARKDOWN_LINK);
+              sc.Forward();
             }
             // Code - also a special case for alternate inside spacing
-            if (sc.Match("``") && sc.GetRelative(3) != ' ' && AtTermStart(sc)) {
+            else if (sc.Match("``") && sc.GetRelative(3) != ' ' && AtTermStart(sc)) {
                 sc.SetState(SCE_MARKDOWN_CODE2);
                 sc.Forward();
             }
diff -Nru scite-4.1.0/scintilla/lexers/LexSAS.cxx scite-4.1.2/scintilla/lexers/LexSAS.cxx
--- scite-4.1.0/scintilla/lexers/LexSAS.cxx	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.1.2/scintilla/lexers/LexSAS.cxx	2018-09-09 09:00:12.000000000 +0000
@@ -0,0 +1,220 @@
+// Scintilla source code edit control
+/** @file LexSAS.cxx
+ ** Lexer for SAS
+ **/
+// Author: Luke Rasmussen (luke.rasmussen@gmail.com)
+//
+// The License.txt file describes the conditions under which this software may
+// be distributed.
+//
+// Developed as part of the StatTag project at Northwestern University Feinberg
+// School of Medicine with funding from Northwestern University Clinical and
+// Translational Sciences Institute through CTSA grant UL1TR001422.  This work
+// has not been reviewed or endorsed by NCATS or the NIH.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Scintilla;
+
+static void ColouriseSASDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+    Accessor &styler) {
+
+    WordList &keywords = *keywordlists[0];
+    WordList &blockKeywords = *keywordlists[1];
+    WordList &functionKeywords = *keywordlists[2];
+    WordList &statements = *keywordlists[3];
+
+    CharacterSet setCouldBePostOp(CharacterSet::setNone, "+-");
+    CharacterSet setMacroStart(CharacterSet::setNone, "%");
+    CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true);
+    CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true);
+
+    StyleContext sc(startPos, length, initStyle, styler);
+    bool lineHasNonCommentChar = false;
+    for (; sc.More(); sc.Forward()) {
+        if (sc.atLineStart) {
+            lineHasNonCommentChar = false;
+        }
+
+        // Determine if the current state should terminate.
+        switch (sc.state) {
+            case SCE_SAS_OPERATOR:
+                sc.SetState(SCE_SAS_DEFAULT);
+                break;
+            case SCE_SAS_NUMBER:
+                // We accept almost anything because of hex. and number suffixes
+                if (!setWord.Contains(sc.ch)) {
+                    sc.SetState(SCE_SAS_DEFAULT);
+                }
+                break;
+            case SCE_SAS_MACRO:
+              if (!setWord.Contains(sc.ch) || (sc.ch == '.')) {
+                char s[1000];
+                sc.GetCurrentLowered(s, sizeof(s));
+                if (keywords.InList(s)) {
+                  sc.ChangeState(SCE_SAS_MACRO_KEYWORD);
+                }
+                else if (blockKeywords.InList(s)) {
+                  sc.ChangeState(SCE_SAS_BLOCK_KEYWORD);
+                }
+                else if (functionKeywords.InList(s)) {
+                  sc.ChangeState(SCE_SAS_MACRO_FUNCTION);
+                }
+                sc.SetState(SCE_SAS_DEFAULT);
+              }
+              break;
+            case SCE_SAS_IDENTIFIER:
+                if (!setWord.Contains(sc.ch) || (sc.ch == '.')) {
+                    char s[1000];
+                    sc.GetCurrentLowered(s, sizeof(s));
+                    if (statements.InList(s)) {
+                      sc.ChangeState(SCE_SAS_STATEMENT);
+                    }
+                    else if(blockKeywords.InList(s)) {
+                      sc.ChangeState(SCE_SAS_BLOCK_KEYWORD);
+                    }
+                    sc.SetState(SCE_SAS_DEFAULT);
+                }
+                break;
+            case SCE_SAS_COMMENTBLOCK:
+                if (sc.Match('*', '/')) {
+                    sc.Forward();
+                    sc.ForwardSetState(SCE_SAS_DEFAULT);
+                }
+                break;
+            case SCE_SAS_COMMENT:
+            case SCE_SAS_COMMENTLINE:
+                if (sc.Match(';')) {
+                    sc.Forward();
+                    sc.SetState(SCE_SAS_DEFAULT);
+                }
+                break;
+            case SCE_SAS_STRING:
+                if (sc.ch == '\"') {
+                    sc.ForwardSetState(SCE_SAS_DEFAULT);
+                }
+                break;
+        }
+
+        // Determine if a new state should be entered.
+        if (sc.state == SCE_SAS_DEFAULT) {
+            if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_SAS_NUMBER);
+            }
+            else if (setWordStart.Contains(sc.ch)) {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_SAS_IDENTIFIER);
+            }
+            else if (sc.Match('*') && !lineHasNonCommentChar) {
+                sc.SetState(SCE_SAS_COMMENT);
+            }
+            else if (sc.Match('/', '*')) {
+                sc.SetState(SCE_SAS_COMMENTBLOCK);
+                sc.Forward();	// Eat the * so it isn't used for the end of the comment
+            }
+            else if (sc.Match('/', '/')) {
+                sc.SetState(SCE_SAS_COMMENTLINE);
+            }
+            else if (sc.ch == '\"') {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_SAS_STRING);
+            }
+            else if (setMacroStart.Contains(sc.ch)) {
+              lineHasNonCommentChar = true;
+              sc.SetState(SCE_SAS_MACRO);
+            }
+            else if (isoperator(static_cast<char>(sc.ch))) {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_SAS_OPERATOR);
+            }
+        }
+    }
+
+    sc.Complete();
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldSASDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[],
+    Accessor &styler) {
+    bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+    bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+    Sci_PositionU endPos = startPos + length;
+    int visibleChars = 0;
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+    int levelCurrent = SC_FOLDLEVELBASE;
+    if (lineCurrent > 0)
+        levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16;
+    int levelMinCurrent = levelCurrent;
+    int levelNext = levelCurrent;
+    char chNext = styler[startPos];
+    int styleNext = styler.StyleAt(startPos);
+    for (Sci_PositionU i = startPos; i < endPos; i++) {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+        int style = styleNext;
+        styleNext = styler.StyleAt(i + 1);
+        bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+        if (style == SCE_R_OPERATOR) {
+            if (ch == '{') {
+                // Measure the minimum before a '{' to allow
+                // folding on "} else {"
+                if (levelMinCurrent > levelNext) {
+                    levelMinCurrent = levelNext;
+                }
+                levelNext++;
+            }
+            else if (ch == '}') {
+                levelNext--;
+            }
+        }
+        if (atEOL) {
+            int levelUse = levelCurrent;
+            if (foldAtElse) {
+                levelUse = levelMinCurrent;
+            }
+            int lev = levelUse | levelNext << 16;
+            if (visibleChars == 0 && foldCompact)
+                lev |= SC_FOLDLEVELWHITEFLAG;
+            if (levelUse < levelNext)
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            if (lev != styler.LevelAt(lineCurrent)) {
+                styler.SetLevel(lineCurrent, lev);
+            }
+            lineCurrent++;
+            levelCurrent = levelNext;
+            levelMinCurrent = levelCurrent;
+            visibleChars = 0;
+        }
+        if (!isspacechar(ch))
+            visibleChars++;
+    }
+}
+
+
+static const char * const SASWordLists[] = {
+    "Language Keywords",
+	  "Macro Keywords",
+    "Types",
+    0,
+};
+
+LexerModule lmSAS(SCLEX_SAS, ColouriseSASDoc, "sas", FoldSASDoc, SASWordLists);
diff -Nru scite-4.1.0/scintilla/lexers/LexStata.cxx scite-4.1.2/scintilla/lexers/LexStata.cxx
--- scite-4.1.0/scintilla/lexers/LexStata.cxx	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.1.2/scintilla/lexers/LexStata.cxx	2018-09-09 09:00:12.000000000 +0000
@@ -0,0 +1,203 @@
+// Scintilla source code edit control
+/** @file LexStata.cxx
+ ** Lexer for Stata
+ **/
+// Author: Luke Rasmussen (luke.rasmussen@gmail.com)
+//
+// The License.txt file describes the conditions under which this software may
+// be distributed.
+//
+// Developed as part of the StatTag project at Northwestern University Feinberg
+// School of Medicine with funding from Northwestern University Clinical and
+// Translational Sciences Institute through CTSA grant UL1TR001422.  This work
+// has not been reviewed or endorsed by NCATS or the NIH.
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+
+#include "ILexer.h"
+#include "Scintilla.h"
+#include "SciLexer.h"
+
+#include "WordList.h"
+#include "LexAccessor.h"
+#include "Accessor.h"
+#include "StyleContext.h"
+#include "CharacterSet.h"
+#include "LexerModule.h"
+
+using namespace Scintilla;
+
+static void ColouriseStataDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[],
+    Accessor &styler) {
+
+    WordList &keywords = *keywordlists[0];
+    WordList &types = *keywordlists[1];
+    
+    CharacterSet setCouldBePostOp(CharacterSet::setNone, "+-");
+    CharacterSet setWordStart(CharacterSet::setAlpha, "_", 0x80, true);
+    CharacterSet setWord(CharacterSet::setAlphaNum, "._", 0x80, true);
+
+    StyleContext sc(startPos, length, initStyle, styler);
+    bool lineHasNonCommentChar = false;
+    for (; sc.More(); sc.Forward()) {
+        if (sc.atLineStart) {
+          lineHasNonCommentChar = false;
+        }
+
+        // Determine if the current state should terminate.
+        switch (sc.state) {
+            case SCE_STATA_OPERATOR:
+                sc.SetState(SCE_STATA_DEFAULT);
+                break;
+            case SCE_STATA_NUMBER:
+                // We accept almost anything because of hex. and number suffixes
+                if (!setWord.Contains(sc.ch)) {
+                    sc.SetState(SCE_STATA_DEFAULT);
+                }
+                break;
+            case SCE_STATA_IDENTIFIER:
+                if (!setWord.Contains(sc.ch) || (sc.ch == '.')) {
+                    char s[1000];
+                    sc.GetCurrent(s, sizeof(s));
+                    if (keywords.InList(s)) {
+                        sc.ChangeState(SCE_STATA_WORD);
+                    }
+                    else if (types.InList(s)) {
+                        sc.ChangeState(SCE_STATA_TYPE);
+                    }
+                    sc.SetState(SCE_STATA_DEFAULT);
+                }
+                break;
+            case SCE_STATA_COMMENTBLOCK:
+                if (sc.Match('*', '/')) {
+                    sc.Forward();
+                    sc.ForwardSetState(SCE_STATA_DEFAULT);
+                }
+                break;
+            case SCE_STATA_COMMENT:
+            case SCE_STATA_COMMENTLINE:
+                if (sc.atLineStart) {
+                    sc.SetState(SCE_STATA_DEFAULT);
+                }
+                break;
+            case SCE_STATA_STRING:
+                if (sc.ch == '\\') {
+                    // Per Stata documentation, the following characters are the only ones that can
+                    // be escaped (not our typical set of quotes, etc.):
+                    // https://www.stata.com/support/faqs/programming/backslashes-and-macros/
+                    if (sc.chNext == '$' || sc.chNext == '`' || sc.chNext == '\\') {
+                        sc.Forward();
+                    }
+                }
+                else if (sc.ch == '\"') {
+                    sc.ForwardSetState(SCE_STATA_DEFAULT);
+                }
+                break;
+        }
+
+        // Determine if a new state should be entered.
+        if (sc.state == SCE_STATA_DEFAULT) {
+            if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_STATA_NUMBER);
+            }
+            else if (setWordStart.Contains(sc.ch)) {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_STATA_IDENTIFIER);
+            }
+            else if (sc.Match('*') && !lineHasNonCommentChar) {
+                sc.SetState(SCE_STATA_COMMENT);
+            }
+            else if (sc.Match('/', '*')) {
+                sc.SetState(SCE_STATA_COMMENTBLOCK);
+                sc.Forward();	// Eat the * so it isn't used for the end of the comment
+            }
+            else if (sc.Match('/', '/')) {
+                sc.SetState(SCE_STATA_COMMENTLINE);
+            }
+            else if (sc.ch == '\"') {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_STATA_STRING);
+            }
+            else if (isoperator(sc.ch)) {
+                lineHasNonCommentChar = true;
+                sc.SetState(SCE_STATA_OPERATOR);
+            }
+        }
+    }
+
+    sc.Complete();
+}
+
+// Store both the current line's fold level and the next lines in the
+// level store to make it easy to pick up with each increment
+// and to make it possible to fiddle the current level for "} else {".
+static void FoldStataDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[],
+    Accessor &styler) {
+    bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
+    bool foldAtElse = styler.GetPropertyInt("fold.at.else", 0) != 0;
+    Sci_PositionU endPos = startPos + length;
+    int visibleChars = 0;
+    Sci_Position lineCurrent = styler.GetLine(startPos);
+    int levelCurrent = SC_FOLDLEVELBASE;
+    if (lineCurrent > 0)
+        levelCurrent = styler.LevelAt(lineCurrent - 1) >> 16;
+    int levelMinCurrent = levelCurrent;
+    int levelNext = levelCurrent;
+    char chNext = styler[startPos];
+    int styleNext = styler.StyleAt(startPos);
+    for (Sci_PositionU i = startPos; i < endPos; i++) {
+        char ch = chNext;
+        chNext = styler.SafeGetCharAt(i + 1);
+        int style = styleNext;
+        styleNext = styler.StyleAt(i + 1);
+        bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+        if (style == SCE_R_OPERATOR) {
+            if (ch == '{') {
+                // Measure the minimum before a '{' to allow
+                // folding on "} else {"
+                if (levelMinCurrent > levelNext) {
+                    levelMinCurrent = levelNext;
+                }
+                levelNext++;
+            }
+            else if (ch == '}') {
+                levelNext--;
+            }
+        }
+        if (atEOL) {
+            int levelUse = levelCurrent;
+            if (foldAtElse) {
+                levelUse = levelMinCurrent;
+            }
+            int lev = levelUse | levelNext << 16;
+            if (visibleChars == 0 && foldCompact)
+                lev |= SC_FOLDLEVELWHITEFLAG;
+            if (levelUse < levelNext)
+                lev |= SC_FOLDLEVELHEADERFLAG;
+            if (lev != styler.LevelAt(lineCurrent)) {
+                styler.SetLevel(lineCurrent, lev);
+            }
+            lineCurrent++;
+            levelCurrent = levelNext;
+            levelMinCurrent = levelCurrent;
+            visibleChars = 0;
+        }
+        if (!isspacechar(ch))
+            visibleChars++;
+    }
+}
+
+
+static const char * const StataWordLists[] = {
+    "Language Keywords",
+    "Types",
+    0,
+};
+
+LexerModule lmStata(SCLEX_STATA, ColouriseStataDoc, "stata", FoldStataDoc, StataWordLists);
diff -Nru scite-4.1.0/scintilla/lexers/LexVerilog.cxx scite-4.1.2/scintilla/lexers/LexVerilog.cxx
--- scite-4.1.0/scintilla/lexers/LexVerilog.cxx	2017-10-22 21:48:03.000000000 +0000
+++ scite-4.1.2/scintilla/lexers/LexVerilog.cxx	2018-10-02 01:35:40.000000000 +0000
@@ -57,7 +57,11 @@
 		return level >= 0 && level < 32;
 	}
 	int maskLevel() const {
-		return 1 << level;
+		if (level >= 0) {
+			return 1 << level;
+		} else {
+			return 1;
+		}
 	}
 public:
 	LinePPState() : state(0), ifTaken(0), level(-1) {
diff -Nru scite-4.1.0/scintilla/qt/ScintillaEdit/ScintillaDocument.cpp scite-4.1.2/scintilla/qt/ScintillaEdit/ScintillaDocument.cpp
--- scite-4.1.0/scintilla/qt/ScintillaEdit/ScintillaDocument.cpp	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/qt/ScintillaEdit/ScintillaDocument.cpp	2018-09-09 09:00:12.000000000 +0000
@@ -41,13 +41,13 @@
     explicit WatcherHelper(ScintillaDocument *owner_);
     virtual ~WatcherHelper();
 
-    void NotifyModifyAttempt(Document *doc, void *userData);
-    void NotifySavePoint(Document *doc, void *userData, bool atSavePoint);
-    void NotifyModified(Document *doc, DocModification mh, void *userData);
-    void NotifyDeleted(Document *doc, void *userData);
+    void NotifyModifyAttempt(Document *doc, void *userData) override;
+    void NotifySavePoint(Document *doc, void *userData, bool atSavePoint) override;
+    void NotifyModified(Document *doc, DocModification mh, void *userData) override;
+    void NotifyDeleted(Document *doc, void *userData) override;
     void NotifyStyleNeeded(Document *doc, void *userData, Sci::Position endPos);
-    void NotifyLexerChanged(Document *doc, void *userData);
-    void NotifyErrorOccurred(Document *doc, void *userData, int status);
+    void NotifyLexerChanged(Document *doc, void *userData) override;
+    void NotifyErrorOccurred(Document *doc, void *userData, int status) override;
 };
 
 WatcherHelper::WatcherHelper(ScintillaDocument *owner_) : owner(owner_) {
diff -Nru scite-4.1.0/scintilla/qt/ScintillaEdit/ScintillaEdit.pro scite-4.1.2/scintilla/qt/ScintillaEdit/ScintillaEdit.pro
--- scite-4.1.0/scintilla/qt/ScintillaEdit/ScintillaEdit.pro	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/qt/ScintillaEdit/ScintillaEdit.pro	2018-10-02 01:35:40.000000000 +0000
@@ -12,7 +12,7 @@
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 4.1.0
+VERSION = 4.1.2
 
 win32 {
         QMAKE_CXXFLAGS += -std:c++latest
diff -Nru scite-4.1.0/scintilla/qt/ScintillaEditBase/PlatQt.cpp scite-4.1.2/scintilla/qt/ScintillaEditBase/PlatQt.cpp
--- scite-4.1.0/scintilla/qt/ScintillaEditBase/PlatQt.cpp	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/qt/ScintillaEditBase/PlatQt.cpp	2018-09-09 09:00:12.000000000 +0000
@@ -1096,6 +1096,11 @@
 		QString path = QString::fromUtf8(modulePath);
 		lib = new QLibrary(path);
 	}
+	// Deleted so DynamicLibraryImpl objects can not be copied
+	DynamicLibraryImpl(const DynamicLibraryImpl &) = delete;
+	DynamicLibraryImpl(DynamicLibraryImpl &&) = delete;
+	DynamicLibraryImpl &operator=(const DynamicLibraryImpl &) = delete;
+	DynamicLibraryImpl &operator=(DynamicLibraryImpl &&) = delete;
 
 	virtual ~DynamicLibraryImpl() {
 		if (lib)
diff -Nru scite-4.1.0/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro scite-4.1.2/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro
--- scite-4.1.0/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro	2018-10-02 01:35:40.000000000 +0000
@@ -12,7 +12,7 @@
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 4.1.0
+VERSION = 4.1.2
 
 win32 {
         QMAKE_CXXFLAGS += -std:c++latest
diff -Nru scite-4.1.0/scintilla/src/Catalogue.cxx scite-4.1.2/scintilla/src/Catalogue.cxx
--- scite-4.1.0/scintilla/src/Catalogue.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/src/Catalogue.cxx	2018-09-09 09:00:12.000000000 +0000
@@ -168,6 +168,7 @@
 	LINK_LEXER(lmRegistry);
 	LINK_LEXER(lmRuby);
 	LINK_LEXER(lmRust);
+	LINK_LEXER(lmSAS);
 	LINK_LEXER(lmScriptol);
 	LINK_LEXER(lmSmalltalk);
 	LINK_LEXER(lmSML);
@@ -176,6 +177,7 @@
 	LINK_LEXER(lmSpice);
 	LINK_LEXER(lmSQL);
 	LINK_LEXER(lmSrec);
+	LINK_LEXER(lmStata);
 	LINK_LEXER(lmSTTXT);
 	LINK_LEXER(lmTACL);
 	LINK_LEXER(lmTADS3);
diff -Nru scite-4.1.0/scintilla/src/CellBuffer.cxx scite-4.1.2/scintilla/src/CellBuffer.cxx
--- scite-4.1.0/scintilla/src/CellBuffer.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/src/CellBuffer.cxx	2018-09-09 09:00:12.000000000 +0000
@@ -7,11 +7,13 @@
 
 #include <cstddef>
 #include <cstdlib>
+#include <cassert>
 #include <cstring>
 #include <cstdio>
 #include <cstdarg>
 
 #include <stdexcept>
+#include <string>
 #include <string_view>
 #include <vector>
 #include <algorithm>
@@ -28,17 +30,53 @@
 
 namespace Scintilla {
 
+struct CountWidths {
+	// Measures the number of characters in a string divided into those
+	// from the Base Multilingual Plane and those from other planes.
+	Sci::Position countBasePlane;
+	Sci::Position countOtherPlanes;
+	CountWidths(Sci::Position countBasePlane_=0, Sci::Position countOtherPlanes_=0) noexcept :
+		countBasePlane(countBasePlane_),
+		countOtherPlanes(countOtherPlanes_) {
+	}
+	CountWidths operator-() const noexcept {
+		return CountWidths(-countBasePlane , -countOtherPlanes);
+	}
+	Sci::Position WidthUTF32() const noexcept {
+		// All code points take one code unit in UTF-32.
+		return countBasePlane + countOtherPlanes;
+	}
+	Sci::Position WidthUTF16() const noexcept {
+		// UTF-16 takes 2 code units for other planes
+		return countBasePlane + 2 * countOtherPlanes;
+	}
+	void CountChar(int lenChar) noexcept {
+		if (lenChar == 4) {
+			countOtherPlanes++;
+		} else {
+			countBasePlane++;
+		}
+	}
+};
+
 class ILineVector {
 public:
 	virtual void Init() = 0;
 	virtual void SetPerLine(PerLine *pl) = 0;
 	virtual void InsertText(Sci::Line line, Sci::Position delta) = 0;
 	virtual void InsertLine(Sci::Line line, Sci::Position position, bool lineStart) = 0;
-	virtual void SetLineStart(Sci::Line line, Sci::Position position) = 0;
+	virtual void SetLineStart(Sci::Line line, Sci::Position position) noexcept = 0;
 	virtual void RemoveLine(Sci::Line line) = 0;
 	virtual Sci::Line Lines() const noexcept = 0;
 	virtual Sci::Line LineFromPosition(Sci::Position pos) const noexcept = 0;
 	virtual Sci::Position LineStart(Sci::Line line) const noexcept = 0;
+	virtual void InsertCharacters(Sci::Line line, CountWidths delta) = 0;
+	virtual void SetLineCharactersWidth(Sci::Line line, CountWidths width) = 0;
+	virtual int LineCharacterIndex() const noexcept = 0;
+	virtual bool AllocateLineCharacterIndex(int lineCharacterIndex, Sci::Line lines) = 0;
+	virtual bool ReleaseLineCharacterIndex(int lineCharacterIndex) = 0;
+	virtual Sci::Position IndexLineStart(Sci::Line line, int lineCharacterIndex) const noexcept = 0;
+	virtual Sci::Line LineFromPositionIndex(Sci::Position pos, int lineCharacterIndex) const noexcept = 0;
 	virtual ~ILineVector() {}
 };
 
@@ -47,9 +85,58 @@
 using namespace Scintilla;
 
 template <typename POS>
+class LineStartIndex {
+public:
+	int refCount;
+	Partitioning<POS> starts;
+
+	LineStartIndex() : refCount(0), starts(4) {
+		// Minimal initial allocation
+	}
+	// Deleted so LineStartIndex objects can not be copied.
+	LineStartIndex(const LineStartIndex &) = delete;
+	LineStartIndex(LineStartIndex &&) = delete;
+	void operator=(const LineStartIndex &) = delete;
+	void operator=(LineStartIndex &&) = delete;
+	virtual ~LineStartIndex() {
+		starts.DeleteAll();
+	}
+	bool Allocate(Sci::Line lines) {
+		refCount++;
+		Sci::Position length = starts.PositionFromPartition(starts.Partitions());
+		for (Sci::Line line = starts.Partitions(); line < lines; line++) {
+			// Produce an ascending sequence that will be filled in with correct widths later
+			length++;
+			starts.InsertPartition(static_cast<POS>(line), static_cast<POS>(length));
+		}
+		return refCount == 1;
+	}
+	bool Release() {
+		if (refCount == 1) {
+			starts.DeleteAll();
+		}
+		refCount--;
+		return refCount == 0;
+	}
+	bool Active() const noexcept {
+		return refCount > 0;
+	}
+	Sci::Position LineWidth(Sci::Line line) const noexcept {
+		return starts.PositionFromPartition(static_cast<POS>(line) + 1) -
+			starts.PositionFromPartition(static_cast<POS>(line));
+	}
+	void SetLineWidth(Sci::Line line, Sci::Position width) {
+		const Sci::Position widthCurrent = LineWidth(line);
+		starts.InsertText(static_cast<POS>(line), static_cast<POS>(width - widthCurrent));
+	}
+};
+
+template <typename POS>
 class LineVector : public ILineVector {
 	Partitioning<POS> starts;
 	PerLine *perLine;
+	LineStartIndex<POS> startsUTF16;
+	LineStartIndex<POS> startsUTF32;
 public:
 	LineVector() : starts(256), perLine(0) {
 		Init();
@@ -66,7 +153,9 @@
 		if (perLine) {
 			perLine->Init();
 		}
- 	}
+		startsUTF32.starts.DeleteAll();
+		startsUTF16.starts.DeleteAll();
+	}
 	void SetPerLine(PerLine *pl) override {
 		perLine = pl;
 	}
@@ -74,18 +163,33 @@
 		starts.InsertText(static_cast<POS>(line), static_cast<POS>(delta));
 	}
 	void InsertLine(Sci::Line line, Sci::Position position, bool lineStart) override {
-		starts.InsertPartition(static_cast<POS>(line), static_cast<POS>(position));
+		const POS lineAsPos = static_cast<POS>(line);
+		starts.InsertPartition(lineAsPos, static_cast<POS>(position));
+		if (startsUTF32.Active()) {
+			startsUTF32.starts.InsertPartition(lineAsPos,
+				static_cast<POS>(startsUTF32.starts.PositionFromPartition(lineAsPos - 1) + 1));
+		}
+		if (startsUTF16.Active()) {
+			startsUTF16.starts.InsertPartition(lineAsPos,
+				static_cast<POS>(startsUTF16.starts.PositionFromPartition(lineAsPos - 1) + 1));
+		}
 		if (perLine) {
 			if ((line > 0) && lineStart)
 				line--;
 			perLine->InsertLine(line);
 		}
 	}
-	void SetLineStart(Sci::Line line, Sci::Position position) override {
+	void SetLineStart(Sci::Line line, Sci::Position position) noexcept override {
 		starts.SetPartitionStartPosition(static_cast<POS>(line), static_cast<POS>(position));
 	}
 	void RemoveLine(Sci::Line line) override {
 		starts.RemovePartition(static_cast<POS>(line));
+		if (startsUTF32.Active()) {
+			startsUTF32.starts.RemovePartition(static_cast<POS>(line));
+		}
+		if (startsUTF16.Active()) {
+			startsUTF16.starts.RemovePartition(static_cast<POS>(line));
+		}
 		if (perLine) {
 			perLine->RemoveLine(line);
 		}
@@ -99,6 +203,71 @@
 	Sci::Position LineStart(Sci::Line line) const noexcept override {
 		return starts.PositionFromPartition(static_cast<POS>(line));
 	}
+	void InsertCharacters(Sci::Line line, CountWidths delta) override {
+		if (startsUTF32.Active()) {
+			startsUTF32.starts.InsertText(static_cast<POS>(line), static_cast<POS>(delta.WidthUTF32()));
+		}
+		if (startsUTF16.Active()) {
+			startsUTF16.starts.InsertText(static_cast<POS>(line), static_cast<POS>(delta.WidthUTF16()));
+		}
+	}
+	void SetLineCharactersWidth(Sci::Line line, CountWidths width) override {
+		if (startsUTF32.Active()) {
+			assert(startsUTF32.starts.Partitions() == starts.Partitions());
+			startsUTF32.SetLineWidth(line, width.WidthUTF32());
+		}
+		if (startsUTF16.Active()) {
+			assert(startsUTF16.starts.Partitions() == starts.Partitions());
+			startsUTF16.SetLineWidth(line, width.WidthUTF16());
+		}
+	}
+
+	int LineCharacterIndex() const noexcept override {
+		int retVal = 0;
+		if (startsUTF32.Active()) {
+			retVal |= SC_LINECHARACTERINDEX_UTF32;
+		}
+		if (startsUTF16.Active()) {
+			retVal |= SC_LINECHARACTERINDEX_UTF16;
+		}
+		return retVal;
+	}
+	bool AllocateLineCharacterIndex(int lineCharacterIndex, Sci::Line lines) override {
+		bool changed = false;
+		if ((lineCharacterIndex & SC_LINECHARACTERINDEX_UTF32) != 0) {
+			changed = startsUTF32.Allocate(lines) || changed;
+			assert(startsUTF32.starts.Partitions() == starts.Partitions());
+		}
+		if ((lineCharacterIndex & SC_LINECHARACTERINDEX_UTF16) != 0) {
+			changed = startsUTF16.Allocate(lines) || changed;
+			assert(startsUTF16.starts.Partitions() == starts.Partitions());
+		}
+		return changed;
+	}
+	bool ReleaseLineCharacterIndex(int lineCharacterIndex) override {
+		bool changed = false;
+		if ((lineCharacterIndex & SC_LINECHARACTERINDEX_UTF32) != 0) {
+			changed = startsUTF32.Release() || changed;
+		}
+		if ((lineCharacterIndex & SC_LINECHARACTERINDEX_UTF16) != 0) {
+			changed = startsUTF16.Release() || changed;
+		}
+		return changed;
+	}
+	Sci::Position IndexLineStart(Sci::Line line, int lineCharacterIndex) const noexcept override {
+		if (lineCharacterIndex == SC_LINECHARACTERINDEX_UTF32) {
+			return startsUTF32.starts.PositionFromPartition(static_cast<POS>(line));
+		} else {
+			return startsUTF16.starts.PositionFromPartition(static_cast<POS>(line));
+		}
+	}
+	Sci::Line LineFromPositionIndex(Sci::Position pos, int lineCharacterIndex) const noexcept override {
+		if (lineCharacterIndex == SC_LINECHARACTERINDEX_UTF32) {
+			return static_cast<Sci::Line>(startsUTF32.starts.PartitionFromPosition(static_cast<POS>(pos)));
+		} else {
+			return static_cast<Sci::Line>(startsUTF16.starts.PartitionFromPosition(static_cast<POS>(pos)));
+		}
+	}
 };
 
 Action::Action() {
@@ -364,6 +533,7 @@
 CellBuffer::CellBuffer(bool hasStyles_, bool largeDocument_) :
 	hasStyles(hasStyles_), largeDocument(largeDocument_) {
 	readOnly = false;
+	utf8Substance = false;
 	utf8LineEnds = 0;
 	collectingUndo = true;
 	if (largeDocument)
@@ -505,10 +675,19 @@
 	}
 }
 
+void CellBuffer::SetUTF8Substance(bool utf8Substance_) {
+	if (utf8Substance != utf8Substance_) {
+		utf8Substance = utf8Substance_;
+		ResetLineEnds();
+	}
+}
+
 void CellBuffer::SetLineEndTypes(int utf8LineEnds_) {
 	if (utf8LineEnds != utf8LineEnds_) {
+		const int indexes = plv->LineCharacterIndex();
 		utf8LineEnds = utf8LineEnds_;
 		ResetLineEnds();
+		AllocateLineCharacterIndex(indexes);
 	}
 }
 
@@ -535,6 +714,23 @@
 	plv->SetPerLine(pl);
 }
 
+int CellBuffer::LineCharacterIndex() const noexcept {
+	return plv->LineCharacterIndex();
+}
+
+void CellBuffer::AllocateLineCharacterIndex(int lineCharacterIndex) {
+	if (utf8Substance) {
+		if (plv->AllocateLineCharacterIndex(lineCharacterIndex, Lines())) {
+			// Changed so recalculate whole file
+			RecalculateIndexLineStarts(0, Lines() - 1);
+		}
+	}
+}
+
+void CellBuffer::ReleaseLineCharacterIndex(int lineCharacterIndex) {
+	plv->ReleaseLineCharacterIndex(lineCharacterIndex);
+}
+
 Sci::Line CellBuffer::Lines() const noexcept {
 	return plv->Lines();
 }
@@ -552,6 +748,14 @@
 	return plv->LineFromPosition(pos);
 }
 
+Sci::Position CellBuffer::IndexLineStart(Sci::Line line, int lineCharacterIndex) const noexcept {
+	return plv->IndexLineStart(line, lineCharacterIndex);
+}
+
+Sci::Line CellBuffer::LineFromPositionIndex(Sci::Position pos, int lineCharacterIndex) const noexcept {
+	return plv->LineFromPositionIndex(pos, lineCharacterIndex);
+}
+
 bool CellBuffer::IsReadOnly() const {
 	return readOnly;
 }
@@ -612,6 +816,37 @@
 	return UTF8IsSeparator(bytes) || UTF8IsSeparator(bytes+1) || UTF8IsNEL(bytes+1);
 }
 
+bool CellBuffer::UTF8IsCharacterBoundary(Sci::Position position) const {
+	assert(position >= 0 && position <= Length());
+	if (position > 0) {
+		std::string back;
+		for (int i = 0; i < UTF8MaxBytes; i++) {
+			const Sci::Position posBack = position - i;
+			if (posBack < 0) {
+				return false;
+			}
+			back.insert(0, 1, substance.ValueAt(posBack));
+			if (!UTF8IsTrailByte(back.front())) {
+				if (i > 0) {
+					// Have reached a non-trail
+					const int cla = UTF8Classify(back);
+					if ((cla & UTF8MaskInvalid) || (cla != i)) {
+						return false;
+					}
+				}
+				break;
+			}
+		}
+	}
+	if (position < Length()) {
+		const unsigned char fore = substance.ValueAt(position);
+		if (UTF8IsTrailByte(fore)) {
+			return false;
+		}
+	}
+	return true;
+}
+
 void CellBuffer::ResetLineEnds() {
 	// Reinitialize line data -- too much work to preserve
 	plv->Init();
@@ -648,6 +883,38 @@
 	}
 }
 
+namespace {
+
+CountWidths CountCharacterWidthsUTF8(std::string_view sv) noexcept {
+	CountWidths cw;
+	size_t remaining = sv.length();
+	while (remaining > 0) {
+		const int utf8Status = UTF8Classify(sv);
+		const int lenChar = utf8Status & UTF8MaskWidth;
+		cw.CountChar(lenChar);
+		sv.remove_prefix(lenChar);
+		remaining -= lenChar;
+	}
+	return cw;
+}
+
+}
+
+void CellBuffer::RecalculateIndexLineStarts(Sci::Line lineFirst, Sci::Line lineLast) {
+	std::string text;
+	Sci::Position posLineEnd = LineStart(lineFirst);
+	for (Sci::Line line = lineFirst; line <= lineLast; line++) {
+		// Find line start and end, retrieve text of line, count characters and update line width
+		const Sci::Position posLineStart = posLineEnd;
+		posLineEnd = LineStart(line+1);
+		const Sci::Position width = posLineEnd - posLineStart;
+		text.resize(width);
+		GetCharRange(text.data(), posLineStart, width);
+		const CountWidths cw = CountCharacterWidthsUTF8(text);
+		plv->SetLineCharactersWidth(line, cw);
+	}
+}
+
 void CellBuffer::BasicInsertString(Sci::Position position, const char *s, Sci::Position insertLength) {
 	if (insertLength == 0)
 		return;
@@ -659,12 +926,25 @@
 		breakingUTF8LineEnd = UTF8LineEndOverlaps(position);
 	}
 
+	const Sci::Line linePosition = plv->LineFromPosition(position);
+	Sci::Line lineInsert = linePosition + 1;
+
+	// A simple insertion is one that inserts valid text on a single line at a character boundary
+	bool simpleInsertion = false;
+
+	// Check for breaking apart a UTF-8 sequence and inserting invalid UTF-8
+	if (utf8Substance && (plv->LineCharacterIndex() != SC_LINECHARACTERINDEX_NONE)) {
+		// Actually, don't need to check that whole insertion is valid just that there
+		// are no potential fragments at ends.
+		simpleInsertion = UTF8IsCharacterBoundary(position) &&
+			UTF8IsValid(std::string_view(s, insertLength));
+	}
+
 	substance.InsertFromArray(position, s, 0, insertLength);
 	if (hasStyles) {
 		style.InsertValue(position, insertLength, 0);
 	}
 
-	Sci::Line lineInsert = plv->LineFromPosition(position) + 1;
 	const bool atLineStart = plv->LineStart(lineInsert-1) == position;
 	// Point all the lines after the insertion point further along in the buffer
 	plv->InsertText(lineInsert-1, insertLength);
@@ -684,6 +964,7 @@
 		if (ch == '\r') {
 			InsertLine(lineInsert, (position + i) + 1, atLineStart);
 			lineInsert++;
+			simpleInsertion = false;
 		} else if (ch == '\n') {
 			if (chPrev == '\r') {
 				// Patch up what was end of line
@@ -692,11 +973,13 @@
 				InsertLine(lineInsert, (position + i) + 1, atLineStart);
 				lineInsert++;
 			}
+			simpleInsertion = false;
 		} else if (utf8LineEnds) {
 			const unsigned char back3[3] = {chBeforePrev, chPrev, ch};
 			if (UTF8IsSeparator(back3) || UTF8IsNEL(back3+1)) {
 				InsertLine(lineInsert, (position + i) + 1, atLineStart);
 				lineInsert++;
+				simpleInsertion = false;
 			}
 		}
 		chBeforePrev = chPrev;
@@ -707,6 +990,7 @@
 		if (ch == '\r') {
 			// End of line already in buffer so drop the newly created one
 			RemoveLine(lineInsert - 1);
+			simpleInsertion = false;
 		}
 	} else if (utf8LineEnds && !UTF8IsAscii(chAfter)) {
 		// May have end of UTF-8 line end in buffer and start in insertion
@@ -716,21 +1000,31 @@
 			if (UTF8IsSeparator(back3)) {
 				InsertLine(lineInsert, (position + insertLength + j) + 1, atLineStart);
 				lineInsert++;
+				simpleInsertion = false;
 			}
 			if ((j == 0) && UTF8IsNEL(back3+1)) {
 				InsertLine(lineInsert, (position + insertLength + j) + 1, atLineStart);
 				lineInsert++;
+				simpleInsertion = false;
 			}
 			chBeforePrev = chPrev;
 			chPrev = chAt;
 		}
 	}
+	if (simpleInsertion) {
+		const CountWidths cw = CountCharacterWidthsUTF8(std::string_view(s, insertLength));
+		plv->InsertCharacters(linePosition, cw);
+	} else {
+		RecalculateIndexLineStarts(linePosition, lineInsert - 1);
+	}
 }
 
 void CellBuffer::BasicDeleteChars(Sci::Position position, Sci::Position deleteLength) {
 	if (deleteLength == 0)
 		return;
 
+	Sci::Line lineRecalculateStart = INVALID_POSITION;
+
 	if ((position == 0) && (deleteLength == substance.Length())) {
 		// If whole buffer is being deleted, faster to reinitialise lines data
 		// than to delete each line.
@@ -739,11 +1033,37 @@
 		// Have to fix up line positions before doing deletion as looking at text in buffer
 		// to work out which lines have been removed
 
-		Sci::Line lineRemove = plv->LineFromPosition(position) + 1;
+		const Sci::Line linePosition = plv->LineFromPosition(position);
+		Sci::Line lineRemove = linePosition + 1;
+
 		plv->InsertText(lineRemove-1, - (deleteLength));
 		const unsigned char chPrev = substance.ValueAt(position - 1);
 		const unsigned char chBefore = chPrev;
 		unsigned char chNext = substance.ValueAt(position);
+
+		// Check for breaking apart a UTF-8 sequence
+		// Needs further checks that text is UTF-8 or that some other break apart is occurring
+		if (utf8Substance && (plv->LineCharacterIndex() != SC_LINECHARACTERINDEX_NONE)) {
+			const Sci::Position posEnd = position + deleteLength;
+			const Sci::Line lineEndRemove = plv->LineFromPosition(posEnd);
+			const bool simpleDeletion =
+				(linePosition == lineEndRemove) &&
+				UTF8IsCharacterBoundary(position) && UTF8IsCharacterBoundary(posEnd);
+			if (simpleDeletion) {
+				std::string text(deleteLength, '\0');
+				GetCharRange(text.data(), position, deleteLength);
+				if (UTF8IsValid(text)) {
+					// Everything is good
+					const CountWidths cw = CountCharacterWidthsUTF8(text);
+					plv->InsertCharacters(linePosition, -cw);
+				} else {
+					lineRecalculateStart = linePosition;
+				}
+			} else {
+				lineRecalculateStart = linePosition;
+			}
+		}
+
 		bool ignoreNL = false;
 		if (chPrev == '\r' && chNext == '\n') {
 			// Move back one
@@ -792,6 +1112,9 @@
 		}
 	}
 	substance.DeleteRange(position, deleteLength);
+	if (lineRecalculateStart >= 0) {
+		RecalculateIndexLineStarts(lineRecalculateStart, lineRecalculateStart);
+	}
 	if (hasStyles) {
 		style.DeleteRange(position, deleteLength);
 	}
diff -Nru scite-4.1.0/scintilla/src/CellBuffer.h scite-4.1.2/scintilla/src/CellBuffer.h
--- scite-4.1.0/scintilla/src/CellBuffer.h	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/src/CellBuffer.h	2018-09-09 09:00:12.000000000 +0000
@@ -113,6 +113,7 @@
 	SplitVector<char> substance;
 	SplitVector<char> style;
 	bool readOnly;
+	bool utf8Substance;
 	int utf8LineEnds;
 
 	bool collectingUndo;
@@ -121,7 +122,9 @@
 	std::unique_ptr<ILineVector> plv;
 
 	bool UTF8LineEndOverlaps(Sci::Position position) const;
+	bool UTF8IsCharacterBoundary(Sci::Position position) const;
 	void ResetLineEnds();
+	void RecalculateIndexLineStarts(Sci::Line lineFirst, Sci::Line lineLast);
 	/// Actions without undo
 	void BasicInsertString(Sci::Position position, const char *s, Sci::Position insertLength);
 	void BasicDeleteChars(Sci::Position position, Sci::Position deleteLength);
@@ -148,13 +151,19 @@
 
 	Sci::Position Length() const noexcept;
 	void Allocate(Sci::Position newSize);
+	void SetUTF8Substance(bool utf8Substance_);
 	int GetLineEndTypes() const { return utf8LineEnds; }
 	void SetLineEndTypes(int utf8LineEnds_);
 	bool ContainsLineEnd(const char *s, Sci::Position length) const;
 	void SetPerLine(PerLine *pl);
+	int LineCharacterIndex() const noexcept;
+	void AllocateLineCharacterIndex(int lineCharacterIndex);
+	void ReleaseLineCharacterIndex(int lineCharacterIndex);
 	Sci::Line Lines() const noexcept;
 	Sci::Position LineStart(Sci::Line line) const noexcept;
+	Sci::Position IndexLineStart(Sci::Line line, int lineCharacterIndex) const noexcept;
 	Sci::Line LineFromPosition(Sci::Position pos) const noexcept;
+	Sci::Line LineFromPositionIndex(Sci::Position pos, int lineCharacterIndex) const noexcept;
 	void InsertLine(Sci::Line line, Sci::Position position, bool lineStart);
 	void RemoveLine(Sci::Line line);
 	const char *InsertString(Sci::Position position, const char *s, Sci::Position insertLength, bool &startSequence);
diff -Nru scite-4.1.0/scintilla/src/Document.cxx scite-4.1.2/scintilla/src/Document.cxx
--- scite-4.1.0/scintilla/src/Document.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/src/Document.cxx	2018-10-02 01:35:40.000000000 +0000
@@ -119,6 +119,7 @@
 	decorations = DecorationListCreate(IsLarge());
 
 	cb.SetPerLine(this);
+	cb.SetUTF8Substance(SC_CP_UTF8 == dbcsCodePage);
 }
 
 Document::~Document() {
@@ -194,6 +195,8 @@
 		dbcsCodePage = dbcsCodePage_;
 		SetCaseFolder(nullptr);
 		cb.SetLineEndTypes(lineEndBitSet & LineEndTypesSupported());
+		cb.SetUTF8Substance(SC_CP_UTF8 == dbcsCodePage);
+		ModifiedAt(0);	// Need to restyle whole document
 		return true;
 	} else {
 		return false;
@@ -293,7 +296,7 @@
 int Document::AddMark(Sci::Line line, int markerNum) {
 	if (line >= 0 && line <= LinesTotal()) {
 		const int prev = Markers()->AddMark(line, markerNum, LinesTotal());
-		const DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line);
+		const DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, nullptr, line);
 		NotifyModified(mh);
 		return prev;
 	} else {
@@ -310,19 +313,19 @@
 		if (m & 1)
 			Markers()->AddMark(line, i, LinesTotal());
 	}
-	const DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line);
+	const DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, nullptr, line);
 	NotifyModified(mh);
 }
 
 void Document::DeleteMark(Sci::Line line, int markerNum) {
 	Markers()->DeleteMark(line, markerNum, false);
-	const DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, 0, line);
+	const DocModification mh(SC_MOD_CHANGEMARKER, LineStart(line), 0, 0, nullptr, line);
 	NotifyModified(mh);
 }
 
 void Document::DeleteMarkFromHandle(int markerHandle) {
 	Markers()->DeleteMarkFromHandle(markerHandle);
-	DocModification mh(SC_MOD_CHANGEMARKER, 0, 0, 0, 0);
+	DocModification mh(SC_MOD_CHANGEMARKER);
 	mh.line = -1;
 	NotifyModified(mh);
 }
@@ -334,7 +337,7 @@
 			someChanges = true;
 	}
 	if (someChanges) {
-		DocModification mh(SC_MOD_CHANGEMARKER, 0, 0, 0, 0);
+		DocModification mh(SC_MOD_CHANGEMARKER);
 		mh.line = -1;
 		NotifyModified(mh);
 	}
@@ -420,11 +423,19 @@
 		return startText;
 }
 
+Sci::Position Document::IndexLineStart(Sci::Line line, int lineCharacterIndex) const {
+	return cb.IndexLineStart(line, lineCharacterIndex);
+}
+
+Sci::Line Document::LineFromPositionIndex(Sci::Position pos, int lineCharacterIndex) const {
+	return cb.LineFromPositionIndex(pos, lineCharacterIndex);
+}
+
 int SCI_METHOD Document::SetLevel(Sci_Position line, int level) {
 	const int prev = Levels()->SetLevel(static_cast<Sci::Line>(line), level, LinesTotal());
 	if (prev != level) {
 		DocModification mh(SC_MOD_CHANGEFOLD | SC_MOD_CHANGEMARKER,
-		                   LineStart(line), 0, 0, 0, static_cast<Sci::Line>(line));
+		                   LineStart(line), 0, 0, nullptr, static_cast<Sci::Line>(line));
 		mh.foldLevelNow = level;
 		mh.foldLevelPrev = prev;
 		NotifyModified(mh);
@@ -2102,7 +2113,19 @@
 	if (regex)
 		return regex->SubstituteByPosition(this, text, length);
 	else
-		return 0;
+		return nullptr;
+}
+
+int Document::LineCharacterIndex() const {
+	return cb.LineCharacterIndex();
+}
+
+void Document::AllocateLineCharacterIndex(int lineCharacterIndex) {
+	return cb.AllocateLineCharacterIndex(lineCharacterIndex);
+}
+
+void Document::ReleaseLineCharacterIndex(int lineCharacterIndex) {
+	return cb.ReleaseLineCharacterIndex(lineCharacterIndex);
 }
 
 Sci::Line Document::LinesTotal() const noexcept {
@@ -2232,7 +2255,7 @@
 int SCI_METHOD Document::SetLineState(Sci_Position line, int state) {
 	const int statePrevious = States()->SetLineState(static_cast<Sci::Line>(line), state);
 	if (state != statePrevious) {
-		const DocModification mh(SC_MOD_CHANGELINESTATE, LineStart(line), 0, 0, 0,
+		const DocModification mh(SC_MOD_CHANGELINESTATE, LineStart(line), 0, 0, nullptr,
 			static_cast<Sci::Line>(line));
 		NotifyModified(mh);
 	}
@@ -2281,7 +2304,7 @@
 void Document::MarginClearAll() {
 	const Sci::Line maxEditorLine = LinesTotal();
 	for (Sci::Line l=0; l<maxEditorLine; l++)
-		MarginSetText(l, 0);
+		MarginSetText(l, nullptr);
 	// Free remaining data
 	Margins()->ClearAll();
 }
@@ -2324,7 +2347,7 @@
 void Document::AnnotationClearAll() {
 	const Sci::Line maxEditorLine = LinesTotal();
 	for (Sci::Line l=0; l<maxEditorLine; l++)
-		AnnotationSetText(l, 0);
+		AnnotationSetText(l, nullptr);
 	// Free remaining data
 	Annotations()->ClearAll();
 }
@@ -2957,7 +2980,6 @@
 
 template<typename Iterator, typename Regex>
 bool MatchOnLines(const Document *doc, const Regex &regexp, const RESearchRange &resr, RESearch &search) {
-	bool matched = false;
 	std::match_results<Iterator> match;
 
 	// MSVC and libc++ have problems with ^ and $ matching line ends inside a range.
@@ -2971,9 +2993,10 @@
 	Iterator itStart(doc, resr.startPos);
 	Iterator itEnd(doc, resr.endPos);
 	const std::regex_constants::match_flag_type flagsMatch = MatchFlags(doc, resr.startPos, resr.endPos);
-	matched = std::regex_search(itStart, itEnd, match, regexp, flagsMatch);
+	const bool matched = std::regex_search(itStart, itEnd, match, regexp, flagsMatch);
 #else
 	// Line by line.
+	bool matched = false;
 	for (Sci::Line line = resr.lineRangeStart; line != resr.lineRangeBreak; line += resr.increment) {
 		const Range lineRange = resr.LineRange(line);
 		Iterator itStart(doc, lineRange.start);
diff -Nru scite-4.1.0/scintilla/src/Document.h scite-4.1.2/scintilla/src/Document.h
--- scite-4.1.0/scintilla/src/Document.h	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/src/Document.h	2018-09-09 09:00:12.000000000 +0000
@@ -389,6 +389,8 @@
 	bool IsLineEndPosition(Sci::Position position) const;
 	bool IsPositionInLineEnd(Sci::Position position) const;
 	Sci::Position VCHomePosition(Sci::Position position) const;
+	Sci::Position IndexLineStart(Sci::Line line, int lineCharacterIndex) const;
+	Sci::Line LineFromPositionIndex(Sci::Position pos, int lineCharacterIndex) const;
 
 	int SCI_METHOD SetLevel(Sci_Position line, int level) override;
 	int SCI_METHOD GetLevel(Sci_Position line) const override;
@@ -414,6 +416,9 @@
 	void SetCaseFolder(CaseFolder *pcf_);
 	Sci::Position FindText(Sci::Position minPos, Sci::Position maxPos, const char *search, int flags, Sci::Position *length);
 	const char *SubstituteByPosition(const char *text, Sci::Position *length);
+	int LineCharacterIndex() const;
+	void AllocateLineCharacterIndex(int lineCharacterIndex);
+	void ReleaseLineCharacterIndex(int lineCharacterIndex);
 	Sci::Line LinesTotal() const noexcept;
 
 	void SetDefaultCharClasses(bool includeWordClass);
diff -Nru scite-4.1.0/scintilla/src/Editor.cxx scite-4.1.2/scintilla/src/Editor.cxx
--- scite-4.1.0/scintilla/src/Editor.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/src/Editor.cxx	2018-10-02 01:35:40.000000000 +0000
@@ -206,7 +206,7 @@
 	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 @@
 	// 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 @@
 }
 
 Point Editor::GetVisibleOriginInMain() const {
-	return Point(0,0);
+	return Point(0, 0);
 }
 
 PointDocument Editor::DocumentPointFromView(Point ptView) const {
@@ -4458,7 +4458,7 @@
 void Editor::MouseLeave() {
 	SetHotSpotRange(nullptr);
 	if (!HaveMouseCapture()) {
-		ptMouseLast = Point(-1,-1);
+		ptMouseLast = Point(-1, -1);
 		DwellEnd(true);
 	}
 }
@@ -4813,7 +4813,7 @@
 		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);
 			}
@@ -5204,7 +5204,7 @@
 	//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;
@@ -5523,7 +5523,7 @@
 }
 
 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] = "\\?";
@@ -6020,6 +6020,11 @@
 			static_cast<Sci::Position>(wParam), lParam),
 			0, pdoc->Length());
 
+	case SCI_POSITIONRELATIVECODEUNITS:
+		return std::clamp<Sci::Position>(pdoc->GetRelativePositionUTF16(
+			static_cast<Sci::Position>(wParam), lParam),
+			0, pdoc->Length());
+
 	case SCI_LINESCROLL:
 		ScrollTo(topLine + static_cast<Sci::Line>(lParam));
 		HorizontalScrollTo(xOffset + static_cast<int>(wParam) * static_cast<int>(vs.spaceWidth));
@@ -6496,15 +6501,15 @@
 
 	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;
 
@@ -6785,6 +6790,23 @@
 	case SCI_GETBIDIRECTIONAL:
 		return static_cast<sptr_t>(bidirectional);
 
+	case SCI_GETLINECHARACTERINDEX:
+		return pdoc->LineCharacterIndex();
+
+	case SCI_ALLOCATELINECHARACTERINDEX:
+		pdoc->AllocateLineCharacterIndex(static_cast<int>(wParam));
+		break;
+
+	case SCI_RELEASELINECHARACTERINDEX:
+		pdoc->ReleaseLineCharacterIndex(static_cast<int>(wParam));
+		break;
+
+	case SCI_LINEFROMINDEXPOSITION:
+		return pdoc->LineFromPositionIndex(static_cast<Sci::Position>(wParam), static_cast<int>(lParam));
+
+	case SCI_INDEXPOSITIONFROMLINE:
+		return pdoc->IndexLineStart(static_cast<Sci::Line>(wParam), static_cast<int>(lParam));
+
 		// Marker definition and setting
 	case SCI_MARKERDEFINE:
 		if (wParam <= MARKER_MAX) {
@@ -7534,11 +7556,15 @@
 		InvalidateStyleRedraw();
 		break;
 
-	case SCI_SETZOOM:
-		vs.zoomLevel = static_cast<int>(wParam);
-		InvalidateStyleRedraw();
-		NotifyZoom();
-		break;
+	case SCI_SETZOOM: {
+			const int zoomLevel = static_cast<int>(wParam);
+			if (zoomLevel != vs.zoomLevel) {
+				vs.zoomLevel = zoomLevel;
+				InvalidateStyleRedraw();
+				NotifyZoom();
+			}
+			break;
+		}
 
 	case SCI_GETZOOM:
 		return vs.zoomLevel;
@@ -8191,6 +8217,9 @@
 	case SCI_COUNTCHARACTERS:
 		return pdoc->CountCharacters(static_cast<Sci::Position>(wParam), lParam);
 
+	case SCI_COUNTCODEUNITS:
+		return pdoc->CountUTF16(static_cast<Sci::Position>(wParam), lParam);
+
 	default:
 		return DefWndProc(iMessage, wParam, lParam);
 	}
diff -Nru scite-4.1.0/scintilla/src/Indicator.cxx scite-4.1.2/scintilla/src/Indicator.cxx
--- scite-4.1.0/scintilla/src/Indicator.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/src/Indicator.cxx	2018-09-09 09:00:12.000000000 +0000
@@ -48,8 +48,7 @@
 		surface->MoveTo(x, irc.top + y);
 		while (x < xLast) {
 			if ((x + 2) > xLast) {
-				if (xLast > x)
-					y = 1;
+				y = 1;
 				x = xLast;
 			} else {
 				x += 2;
diff -Nru scite-4.1.0/scintilla/src/KeyMap.cxx scite-4.1.2/scintilla/src/KeyMap.cxx
--- scite-4.1.0/scintilla/src/KeyMap.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/src/KeyMap.cxx	2018-09-09 09:00:12.000000000 +0000
@@ -46,6 +46,10 @@
 	return (it == kmap.end()) ? 0 : it->second;
 }
 
+const std::map<KeyModifiers, unsigned int> &KeyMap::GetKeyMap() const {
+	return kmap;
+}
+
 #if PLAT_GTK_MACOSX
 #define OS_X_KEYS 1
 #else
diff -Nru scite-4.1.0/scintilla/src/KeyMap.h scite-4.1.2/scintilla/src/KeyMap.h
--- scite-4.1.0/scintilla/src/KeyMap.h	2017-10-22 21:48:03.000000000 +0000
+++ scite-4.1.2/scintilla/src/KeyMap.h	2018-09-09 09:00:12.000000000 +0000
@@ -56,6 +56,7 @@
 	void Clear();
 	void AssignCmdKey(int key, int modifiers, unsigned int msg);
 	unsigned int Find(int key, int modifiers) const;	// 0 returned on failure
+	const std::map<KeyModifiers, unsigned int> &GetKeyMap() const;
 };
 
 }
diff -Nru scite-4.1.0/scintilla/src/PositionCache.cxx scite-4.1.2/scintilla/src/PositionCache.cxx
--- scite-4.1.0/scintilla/src/PositionCache.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/src/PositionCache.cxx	2018-10-02 01:35:40.000000000 +0000
@@ -494,13 +494,14 @@
 }
 
 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 -Nru scite-4.1.0/scintilla/src/RunStyles.cxx scite-4.1.2/scintilla/src/RunStyles.cxx
--- scite-4.1.0/scintilla/src/RunStyles.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/src/RunStyles.cxx	2018-09-09 09:00:12.000000000 +0000
@@ -309,7 +309,7 @@
 
 template class Scintilla::RunStyles<int, int>;
 template class Scintilla::RunStyles<int, char>;
-#if PTRDIFF_MAX != INT_MAX
+#if (PTRDIFF_MAX != INT_MAX) || PLAT_HAIKU
 template class Scintilla::RunStyles<ptrdiff_t, int>;
 template class Scintilla::RunStyles<ptrdiff_t, char>;
 #endif
diff -Nru scite-4.1.0/scintilla/src/RunStyles.cxx.orig scite-4.1.2/scintilla/src/RunStyles.cxx.orig
--- scite-4.1.0/scintilla/src/RunStyles.cxx.orig	1970-01-01 00:00:00.000000000 +0000
+++ scite-4.1.2/scintilla/src/RunStyles.cxx.orig	2018-07-21 22:39:09.000000000 +0000
@@ -0,0 +1,315 @@
+/** @file RunStyles.cxx
+ ** Data structure used to store sparse styles.
+ **/
+// Copyright 1998-2007 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cstddef>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
+#include <climits>
+
+#include <stdexcept>
+#include <string_view>
+#include <vector>
+#include <algorithm>
+#include <memory>
+
+#include "Platform.h"
+
+#include "Scintilla.h"
+#include "Position.h"
+#include "SplitVector.h"
+#include "Partitioning.h"
+#include "RunStyles.h"
+
+using namespace Scintilla;
+
+// Find the first run at a position
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::RunFromPosition(DISTANCE position) const noexcept {
+	DISTANCE run = starts->PartitionFromPosition(position);
+	// Go to first element with this position
+	while ((run > 0) && (position == starts->PositionFromPartition(run-1))) {
+		run--;
+	}
+	return run;
+}
+
+// If there is no run boundary at position, insert one continuing style.
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::SplitRun(DISTANCE position) {
+	DISTANCE run = RunFromPosition(position);
+	const DISTANCE posRun = starts->PositionFromPartition(run);
+	if (posRun < position) {
+		STYLE runStyle = ValueAt(position);
+		run++;
+		starts->InsertPartition(run, position);
+		styles->InsertValue(run, 1, runStyle);
+	}
+	return run;
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::RemoveRun(DISTANCE run) {
+	starts->RemovePartition(run);
+	styles->DeleteRange(run, 1);
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::RemoveRunIfEmpty(DISTANCE run) {
+	if ((run < starts->Partitions()) && (starts->Partitions() > 1)) {
+		if (starts->PositionFromPartition(run) == starts->PositionFromPartition(run+1)) {
+			RemoveRun(run);
+		}
+	}
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::RemoveRunIfSameAsPrevious(DISTANCE run) {
+	if ((run > 0) && (run < starts->Partitions())) {
+		if (styles->ValueAt(run-1) == styles->ValueAt(run)) {
+			RemoveRun(run);
+		}
+	}
+}
+
+template <typename DISTANCE, typename STYLE>
+RunStyles<DISTANCE, STYLE>::RunStyles() {
+	starts = std::make_unique<Partitioning<DISTANCE>>(8);
+	styles = std::make_unique<SplitVector<STYLE>>();
+	styles->InsertValue(0, 2, 0);
+}
+
+template <typename DISTANCE, typename STYLE>
+RunStyles<DISTANCE, STYLE>::~RunStyles() {
+}
+
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::Length() const noexcept {
+	return starts->PositionFromPartition(starts->Partitions());
+}
+
+template <typename DISTANCE, typename STYLE>
+STYLE RunStyles<DISTANCE, STYLE>::ValueAt(DISTANCE position) const noexcept {
+	return styles->ValueAt(starts->PartitionFromPosition(position));
+}
+
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::FindNextChange(DISTANCE position, DISTANCE end) const noexcept {
+	const DISTANCE run = starts->PartitionFromPosition(position);
+	if (run < starts->Partitions()) {
+		const DISTANCE runChange = starts->PositionFromPartition(run);
+		if (runChange > position)
+			return runChange;
+		const DISTANCE nextChange = starts->PositionFromPartition(run + 1);
+		if (nextChange > position) {
+			return nextChange;
+		} else if (position < end) {
+			return end;
+		} else {
+			return end + 1;
+		}
+	} else {
+		return end + 1;
+	}
+}
+
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::StartRun(DISTANCE position) const noexcept {
+	return starts->PositionFromPartition(starts->PartitionFromPosition(position));
+}
+
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::EndRun(DISTANCE position) const noexcept {
+	return starts->PositionFromPartition(starts->PartitionFromPosition(position) + 1);
+}
+
+template <typename DISTANCE, typename STYLE>
+FillResult<DISTANCE> RunStyles<DISTANCE, STYLE>::FillRange(DISTANCE position, STYLE value, DISTANCE fillLength) {
+	const FillResult<DISTANCE> resultNoChange{false, position, fillLength};
+	if (fillLength <= 0) {
+		return resultNoChange;
+	}
+	DISTANCE end = position + fillLength;
+	if (end > Length()) {
+		return resultNoChange;
+	}
+	DISTANCE runEnd = RunFromPosition(end);
+	if (styles->ValueAt(runEnd) == value) {
+		// End already has value so trim range.
+		end = starts->PositionFromPartition(runEnd);
+		if (position >= end) {
+			// Whole range is already same as value so no action
+			return resultNoChange;
+		}
+		fillLength = end - position;
+	} else {
+		runEnd = SplitRun(end);
+	}
+	DISTANCE runStart = RunFromPosition(position);
+	if (styles->ValueAt(runStart) == value) {
+		// Start is in expected value so trim range.
+		runStart++;
+		position = starts->PositionFromPartition(runStart);
+		fillLength = end - position;
+	} else {
+		if (starts->PositionFromPartition(runStart) < position) {
+			runStart = SplitRun(position);
+			runEnd++;
+		}
+	}
+	if (runStart < runEnd) {
+		const FillResult<DISTANCE> result{ true, position, fillLength };
+		styles->SetValueAt(runStart, value);
+		// Remove each old run over the range
+		for (DISTANCE run=runStart+1; run<runEnd; run++) {
+			RemoveRun(runStart+1);
+		}
+		runEnd = RunFromPosition(end);
+		RemoveRunIfSameAsPrevious(runEnd);
+		RemoveRunIfSameAsPrevious(runStart);
+		runEnd = RunFromPosition(end);
+		RemoveRunIfEmpty(runEnd);
+		return result;
+	} else {
+		return resultNoChange;
+	}
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::SetValueAt(DISTANCE position, STYLE value) {
+	FillRange(position, value, 1);
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::InsertSpace(DISTANCE position, DISTANCE insertLength) {
+	DISTANCE runStart = RunFromPosition(position);
+	if (starts->PositionFromPartition(runStart) == position) {
+		STYLE runStyle = ValueAt(position);
+		// Inserting at start of run so make previous longer
+		if (runStart == 0) {
+			// Inserting at start of document so ensure 0
+			if (runStyle) {
+				styles->SetValueAt(0, STYLE());
+				starts->InsertPartition(1, 0);
+				styles->InsertValue(1, 1, runStyle);
+				starts->InsertText(0, insertLength);
+			} else {
+				starts->InsertText(runStart, insertLength);
+			}
+		} else {
+			if (runStyle) {
+				starts->InsertText(runStart-1, insertLength);
+			} else {
+				// Insert at end of run so do not extend style
+				starts->InsertText(runStart, insertLength);
+			}
+		}
+	} else {
+		starts->InsertText(runStart, insertLength);
+	}
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::DeleteAll() {
+	starts = std::make_unique<Partitioning<DISTANCE>>(8);
+	styles = std::make_unique<SplitVector<STYLE>>();
+	styles->InsertValue(0, 2, 0);
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::DeleteRange(DISTANCE position, DISTANCE deleteLength) {
+	DISTANCE end = position + deleteLength;
+	DISTANCE runStart = RunFromPosition(position);
+	DISTANCE runEnd = RunFromPosition(end);
+	if (runStart == runEnd) {
+		// Deleting from inside one run
+		starts->InsertText(runStart, -deleteLength);
+		RemoveRunIfEmpty(runStart);
+	} else {
+		runStart = SplitRun(position);
+		runEnd = SplitRun(end);
+		starts->InsertText(runStart, -deleteLength);
+		// Remove each old run over the range
+		for (DISTANCE run=runStart; run<runEnd; run++) {
+			RemoveRun(runStart);
+		}
+		RemoveRunIfEmpty(runStart);
+		RemoveRunIfSameAsPrevious(runStart);
+	}
+}
+
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::Runs() const noexcept {
+	return starts->Partitions();
+}
+
+template <typename DISTANCE, typename STYLE>
+bool RunStyles<DISTANCE, STYLE>::AllSame() const noexcept {
+	for (int run = 1; run < starts->Partitions(); run++) {
+		if (styles->ValueAt(run) != styles->ValueAt(run - 1))
+			return false;
+	}
+	return true;
+}
+
+template <typename DISTANCE, typename STYLE>
+bool RunStyles<DISTANCE, STYLE>::AllSameAs(STYLE value) const noexcept {
+	return AllSame() && (styles->ValueAt(0) == value);
+}
+
+template <typename DISTANCE, typename STYLE>
+DISTANCE RunStyles<DISTANCE, STYLE>::Find(STYLE value, DISTANCE start) const noexcept {
+	if (start < Length()) {
+		DISTANCE run = start ? RunFromPosition(start) : 0;
+		if (styles->ValueAt(run) == value)
+			return start;
+		run++;
+		while (run < starts->Partitions()) {
+			if (styles->ValueAt(run) == value)
+				return starts->PositionFromPartition(run);
+			run++;
+		}
+	}
+	return -1;
+}
+
+template <typename DISTANCE, typename STYLE>
+void RunStyles<DISTANCE, STYLE>::Check() const {
+	if (Length() < 0) {
+		throw std::runtime_error("RunStyles: Length can not be negative.");
+	}
+	if (starts->Partitions() < 1) {
+		throw std::runtime_error("RunStyles: Must always have 1 or more partitions.");
+	}
+	if (starts->Partitions() != styles->Length()-1) {
+		throw std::runtime_error("RunStyles: Partitions and styles different lengths.");
+	}
+	DISTANCE start=0;
+	while (start < Length()) {
+		const DISTANCE end = EndRun(start);
+		if (start >= end) {
+			throw std::runtime_error("RunStyles: Partition is 0 length.");
+		}
+		start = end;
+	}
+	if (styles->ValueAt(styles->Length()-1) != 0) {
+		throw std::runtime_error("RunStyles: Unused style at end changed.");
+	}
+	for (int j=1; j<styles->Length()-1; j++) {
+		if (styles->ValueAt(j) == styles->ValueAt(j-1)) {
+			throw std::runtime_error("RunStyles: Style of a partition same as previous.");
+		}
+	}
+}
+
+template class Scintilla::RunStyles<int, int>;
+template class Scintilla::RunStyles<int, char>;
+//#if PTRDIFF_MAX != INT_MAX
+template class Scintilla::RunStyles<ptrdiff_t, int>;
+template class Scintilla::RunStyles<ptrdiff_t, char>;
+//#endif
diff -Nru scite-4.1.0/scintilla/src/UniConversion.cxx scite-4.1.2/scintilla/src/UniConversion.cxx
--- scite-4.1.0/scintilla/src/UniConversion.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/src/UniConversion.cxx	2018-09-09 09:00:12.000000000 +0000
@@ -340,6 +340,22 @@
 	return (utf8StatusNext & UTF8MaskInvalid) ? 1 : (utf8StatusNext & UTF8MaskWidth);
 }
 
+bool UTF8IsValid(std::string_view sv) noexcept {
+	const unsigned char *us = reinterpret_cast<const unsigned char *>(sv.data());
+	size_t remaining = sv.length();
+	while (remaining > 0) {
+		const int utf8Status = UTF8Classify(us, remaining);
+		if (utf8Status & UTF8MaskInvalid) {
+			return false;
+		} else {
+			const int lenChar = utf8Status & UTF8MaskWidth;
+			us += lenChar;
+			remaining -= lenChar;
+		}
+	}
+	return remaining == 0;
+}
+
 // Replace invalid bytes in UTF-8 with the replacement character
 std::string FixInvalidUTF8(const std::string &text) {
 	std::string result;
diff -Nru scite-4.1.0/scintilla/src/UniConversion.h scite-4.1.2/scintilla/src/UniConversion.h
--- scite-4.1.0/scintilla/src/UniConversion.h	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/src/UniConversion.h	2018-09-09 09:00:12.000000000 +0000
@@ -22,6 +22,7 @@
 size_t UTF16FromUTF8(std::string_view sv, wchar_t *tbuf, size_t tlen);
 size_t UTF32FromUTF8(std::string_view sv, unsigned int *tbuf, size_t tlen);
 unsigned int UTF16FromUTF32Character(unsigned int val, wchar_t *tbuf) noexcept;
+bool UTF8IsValid(std::string_view sv) noexcept;
 std::string FixInvalidUTF8(const std::string &text);
 
 extern const unsigned char UTF8BytesOfLead[256];
@@ -49,6 +50,9 @@
 
 enum { UTF8MaskWidth=0x7, UTF8MaskInvalid=0x8 };
 int UTF8Classify(const unsigned char *us, size_t len) noexcept;
+inline int UTF8Classify(std::string_view sv) noexcept {
+	return UTF8Classify(reinterpret_cast<const unsigned char *>(sv.data()), sv.length());
+}
 
 // Similar to UTF8Classify but returns a length of 1 for invalid bytes
 // instead of setting the invalid flag
diff -Nru scite-4.1.0/scintilla/src/ViewStyle.cxx scite-4.1.2/scintilla/src/ViewStyle.cxx
--- scite-4.1.0/scintilla/src/ViewStyle.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/src/ViewStyle.cxx	2018-09-09 09:00:12.000000000 +0000
@@ -430,7 +430,7 @@
 
 int ViewStyle::MarginFromLocation(Point pt) const {
 	int margin = -1;
-	int x = textStart - fixedColumnWidth;
+	int x = marginInside ? 0 : -fixedColumnWidth;
 	for (size_t i = 0; i < ms.size(); i++) {
 		if ((pt.x >= x) && (pt.x < x + ms[i].width))
 			margin = static_cast<int>(i);
diff -Nru scite-4.1.0/scintilla/test/simpleTests.py scite-4.1.2/scintilla/test/simpleTests.py
--- scite-4.1.0/scintilla/test/simpleTests.py	2018-04-10 01:38:39.000000000 +0000
+++ scite-4.1.2/scintilla/test/simpleTests.py	2018-09-09 09:00:12.000000000 +0000
@@ -1631,6 +1631,76 @@
 		self.ed.StyleSetHotSpot(self.ed.STYLE_DEFAULT, 1)
 		self.assertEquals(self.ed.StyleGetHotSpot(self.ed.STYLE_DEFAULT), 1)
 
+class TestIndices(unittest.TestCase):
+	def setUp(self):
+		self.xite = Xite.xiteFrame
+		self.ed = self.xite.ed
+		self.ed.ClearAll()
+		self.ed.EmptyUndoBuffer()
+		self.ed.SetCodePage(65001)
+		# Text includes one non-BMP character
+		t = "aå\U00010348flﬔ-\n"
+		self.tv = t.encode("UTF-8")
+
+	def tearDown(self):
+		self.ed.SetCodePage(0)
+
+	def testAllocation(self):
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+		self.ed.AllocateLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32)
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_UTF32)
+		self.ed.ReleaseLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32)
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+
+	def testUTF32(self):
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+		self.ed.SetContents(self.tv)
+		self.ed.AllocateLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32)
+		self.assertEquals(self.ed.IndexPositionFromLine(0, self.ed.SC_LINECHARACTERINDEX_UTF32), 0)
+		self.assertEquals(self.ed.IndexPositionFromLine(1, self.ed.SC_LINECHARACTERINDEX_UTF32), 7)
+		self.ed.ReleaseLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32)
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+
+	def testUTF16(self):
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+		t = "aå\U00010348flﬔ-"
+		tv = t.encode("UTF-8")
+		self.ed.SetContents(self.tv)
+		self.ed.AllocateLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF16)
+		self.assertEquals(self.ed.IndexPositionFromLine(0, self.ed.SC_LINECHARACTERINDEX_UTF16), 0)
+		self.assertEquals(self.ed.IndexPositionFromLine(1, self.ed.SC_LINECHARACTERINDEX_UTF16), 8)
+		self.ed.ReleaseLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF16)
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+
+	def testBoth(self):
+		# Set text before turning indices on
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+		self.ed.SetContents(self.tv)
+		self.ed.AllocateLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32+self.ed.SC_LINECHARACTERINDEX_UTF16)
+		self.assertEquals(self.ed.IndexPositionFromLine(0, self.ed.SC_LINECHARACTERINDEX_UTF32), 0)
+		self.assertEquals(self.ed.IndexPositionFromLine(1, self.ed.SC_LINECHARACTERINDEX_UTF32), 7)
+		self.assertEquals(self.ed.IndexPositionFromLine(0, self.ed.SC_LINECHARACTERINDEX_UTF16), 0)
+		self.assertEquals(self.ed.IndexPositionFromLine(1, self.ed.SC_LINECHARACTERINDEX_UTF16), 8)
+		# Test the inverse: position->line
+		self.assertEquals(self.ed.LineFromIndexPosition(0, self.ed.SC_LINECHARACTERINDEX_UTF32), 0)
+		self.assertEquals(self.ed.LineFromIndexPosition(7, self.ed.SC_LINECHARACTERINDEX_UTF32), 1)
+		self.assertEquals(self.ed.LineFromIndexPosition(0, self.ed.SC_LINECHARACTERINDEX_UTF16), 0)
+		self.assertEquals(self.ed.LineFromIndexPosition(8, self.ed.SC_LINECHARACTERINDEX_UTF16), 1)
+		self.ed.ReleaseLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32+self.ed.SC_LINECHARACTERINDEX_UTF16)
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+
+	def testMaintenance(self):
+		# Set text after turning indices on
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+		self.ed.AllocateLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32+self.ed.SC_LINECHARACTERINDEX_UTF16)
+		self.ed.SetContents(self.tv)
+		self.assertEquals(self.ed.IndexPositionFromLine(0, self.ed.SC_LINECHARACTERINDEX_UTF32), 0)
+		self.assertEquals(self.ed.IndexPositionFromLine(1, self.ed.SC_LINECHARACTERINDEX_UTF32), 7)
+		self.assertEquals(self.ed.IndexPositionFromLine(0, self.ed.SC_LINECHARACTERINDEX_UTF16), 0)
+		self.assertEquals(self.ed.IndexPositionFromLine(1, self.ed.SC_LINECHARACTERINDEX_UTF16), 8)
+		self.ed.ReleaseLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF32+self.ed.SC_LINECHARACTERINDEX_UTF16)
+		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
+
 class TestCharacterNavigation(unittest.TestCase):
 	def setUp(self):
 		self.xite = Xite.xiteFrame
@@ -1677,6 +1747,31 @@
 			self.assert_(after < previous)
 			previous = after
 
+	def testRelativeNonBOM(self):
+		# \x61  \xF0\x90\x8D\x88  \xef\xac\x82   \xef\xac\x94   \x2d
+		t = "a\U00010348flﬔ-"
+		tv = t.encode("UTF-8")
+		self.ed.SetContents(tv)
+		self.assertEquals(self.ed.PositionRelative(1, 2), 8)
+		self.assertEquals(self.ed.CountCharacters(1, 8), 2)
+		self.assertEquals(self.ed.CountCodeUnits(1, 8), 3)
+		self.assertEquals(self.ed.PositionRelative(8, -2), 1)
+		self.assertEquals(self.ed.PositionRelativeCodeUnits(8, -3), 1)
+		pos = 0
+		previous = 0
+		for i in range(1, len(t)):
+			after = self.ed.PositionRelative(pos, i)
+			self.assert_(after > pos)
+			self.assert_(after > previous)
+			previous = after
+		pos = len(t)
+		previous = pos
+		for i in range(1, len(t)-1):
+			after = self.ed.PositionRelative(pos, -i)
+			self.assert_(after < pos)
+			self.assert_(after <= previous)
+			previous = after
+
 	def testLineEnd(self):
 		t = "a\r\nb\nc"
 		tv = t.encode("UTF-8")
diff -Nru scite-4.1.0/scintilla/test/unit/testCellBuffer.cxx scite-4.1.2/scintilla/test/unit/testCellBuffer.cxx
--- scite-4.1.0/scintilla/test/unit/testCellBuffer.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/test/unit/testCellBuffer.cxx	2018-09-09 09:00:12.000000000 +0000
@@ -10,6 +10,7 @@
 
 #include "Platform.h"
 
+#include "Scintilla.h"
 #include "Position.h"
 #include "SplitVector.h"
 #include "Partitioning.h"
@@ -145,3 +146,290 @@
 	}
 
 }
+
+TEST_CASE("CharacterIndex") {
+
+	CellBuffer cb(true, false);
+
+	SECTION("Setup") {
+		REQUIRE(cb.LineCharacterIndex() == SC_LINECHARACTERINDEX_NONE);
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 0);
+		cb.SetUTF8Substance(true);
+
+		cb.AllocateLineCharacterIndex(SC_LINECHARACTERINDEX_UTF16);
+		REQUIRE(cb.LineCharacterIndex() == SC_LINECHARACTERINDEX_UTF16);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 0);
+
+		cb.ReleaseLineCharacterIndex(SC_LINECHARACTERINDEX_UTF16);
+		REQUIRE(cb.LineCharacterIndex() == SC_LINECHARACTERINDEX_NONE);
+	}
+
+	SECTION("Insertion") {
+		cb.SetUTF8Substance(true);
+
+		cb.AllocateLineCharacterIndex(SC_LINECHARACTERINDEX_UTF16 | SC_LINECHARACTERINDEX_UTF32);
+
+		bool startSequence = false;
+		cb.InsertString(0, "a", 1, startSequence);
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 1);
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 1);
+
+		const char *hwair = "\xF0\x90\x8D\x88";
+		cb.InsertString(0, hwair, strlen(hwair), startSequence);
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 3);
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 2);
+	}
+
+	SECTION("Deletion") {
+		cb.SetUTF8Substance(true);
+
+		cb.AllocateLineCharacterIndex(SC_LINECHARACTERINDEX_UTF16 | SC_LINECHARACTERINDEX_UTF32);
+
+		bool startSequence = false;
+		const char *hwair = "a\xF0\x90\x8D\x88z";
+		cb.InsertString(0, hwair, strlen(hwair), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 4);
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 3);
+
+		cb.DeleteChars(5, 1, startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 3);
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 2);
+
+		cb.DeleteChars(1, 4, startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 1);
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 1);
+	}
+
+	SECTION("Insert Complex") {
+		cb.SetUTF8Substance(true);
+		cb.SetLineEndTypes(1);
+		cb.AllocateLineCharacterIndex(SC_LINECHARACTERINDEX_UTF16 | SC_LINECHARACTERINDEX_UTF32);
+
+		bool startSequence = false;
+		// 3 lines of text containing 8 bytes
+		const char *data = "a\n\xF0\x90\x8D\x88\nz";
+		cb.InsertString(0, data, strlen(data), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 2);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF16) == 5);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF16) == 6);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 2);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF32) == 4);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF32) == 5);
+
+		// Insert a new line at end -> "a\n\xF0\x90\x8D\x88\nz\n" 4 lines
+		// Last line empty
+		cb.InsertString(strlen(data), "\n", 1, startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 2);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF16) == 5);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF16) == 7);
+		REQUIRE(cb.IndexLineStart(4, SC_LINECHARACTERINDEX_UTF16) == 7);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 2);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF32) == 4);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF32) == 6);
+		REQUIRE(cb.IndexLineStart(4, SC_LINECHARACTERINDEX_UTF32) == 6);
+
+		// Insert a new line before end -> "a\n\xF0\x90\x8D\x88\nz\n\n" 5 lines
+		cb.InsertString(strlen(data), "\n", 1, startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 2);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF16) == 5);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF16) == 7);
+		REQUIRE(cb.IndexLineStart(4, SC_LINECHARACTERINDEX_UTF16) == 8);
+		REQUIRE(cb.IndexLineStart(5, SC_LINECHARACTERINDEX_UTF16) == 8);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 2);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF32) == 4);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF32) == 6);
+		REQUIRE(cb.IndexLineStart(4, SC_LINECHARACTERINDEX_UTF32) == 7);
+		REQUIRE(cb.IndexLineStart(5, SC_LINECHARACTERINDEX_UTF32) == 7);
+
+		// Insert a valid 3-byte UTF-8 character at start -> 
+		// "\xE2\x82\xACa\n\xF0\x90\x8D\x88\nz\n\n" 5 lines
+
+		const char *euro = "\xE2\x82\xAC";
+		cb.InsertString(0, euro, strlen(euro), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 3);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF16) == 6);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF16) == 8);
+		REQUIRE(cb.IndexLineStart(4, SC_LINECHARACTERINDEX_UTF16) == 9);
+		REQUIRE(cb.IndexLineStart(5, SC_LINECHARACTERINDEX_UTF16) == 9);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 3);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF32) == 5);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF32) == 7);
+		REQUIRE(cb.IndexLineStart(4, SC_LINECHARACTERINDEX_UTF32) == 8);
+		REQUIRE(cb.IndexLineStart(5, SC_LINECHARACTERINDEX_UTF32) == 8);
+
+		// Insert a lone lead byte implying a 3 byte character at start of line 2 -> 
+		// "\xE2\x82\xACa\n\EF\xF0\x90\x8D\x88\nz\n\n" 5 lines
+		// Should be treated as a single byte character
+
+		const char *lead = "\xEF";
+		cb.InsertString(5, lead, strlen(lead), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 3);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF16) == 7);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF16) == 9);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 3);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF32) == 6);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF32) == 8);
+
+		// Insert an ASCII lead byte inside the 3-byte initial character ->
+		// "\xE2!\x82\xACa\n\EF\xF0\x90\x8D\x88\nz\n\n" 5 lines
+		// It should b treated as a single character and should cause the
+		// byte before and the 2 bytes after also be each treated as singles
+		// so 3 more characters on line 0.
+
+		const char *ascii = "!";
+		cb.InsertString(1, ascii, strlen(ascii), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 6);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF16) == 10);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 6);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF32) == 9);
+
+		// Insert a NEL after the '!' to trigger the utf8 line end case ->
+		// "\xE2!\xC2\x85 \x82\xACa\n \EF\xF0\x90\x8D\x88\n z\n\n" 5 lines
+
+		const char *nel = "\xC2\x85";
+		cb.InsertString(2, nel, strlen(nel), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 3);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF16) == 7);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF16) == 11);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 3);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF32) == 7);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF32) == 10);
+	}
+
+	SECTION("Delete Multiple lines") {
+		cb.SetUTF8Substance(true);
+		cb.AllocateLineCharacterIndex(SC_LINECHARACTERINDEX_UTF16 | SC_LINECHARACTERINDEX_UTF32);
+
+		bool startSequence = false;
+		// 3 lines of text containing 8 bytes
+		const char *data = "a\n\xF0\x90\x8D\x88\nz\nc";
+		cb.InsertString(0, data, strlen(data), startSequence);
+
+		// Delete first 2 new lines -> "az\nc"
+		cb.DeleteChars(1, strlen(data) - 4, startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 3);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF16) == 4);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 3);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF32) == 4);
+	}
+
+	SECTION("Delete Complex") {
+		cb.SetUTF8Substance(true);
+		cb.AllocateLineCharacterIndex(SC_LINECHARACTERINDEX_UTF16 | SC_LINECHARACTERINDEX_UTF32);
+
+		bool startSequence = false;
+		// 3 lines of text containing 8 bytes
+		const char *data = "a\n\xF0\x90\x8D\x88\nz";
+		cb.InsertString(0, data, strlen(data), startSequence);
+
+		// Delete lead byte from character on line 1 ->
+		// "a\n\x90\x8D\x88\nz"
+		// line 1 becomes 4 single byte characters
+		cb.DeleteChars(2, 1, startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 2);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF16) == 6);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF16) == 7);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 2);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF32) == 6);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF32) == 7);
+
+		// Delete first new line ->
+		// "a\x90\x8D\x88\nz"
+		// Only 2 lines with line 0 containing 5 single byte characters
+		cb.DeleteChars(1, 1, startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 5);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF16) == 6);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 5);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF32) == 6);
+
+		// Restore lead byte from character on line 0 making a 4-byte character ->
+		// "a\xF0\x90\x8D\x88\nz"
+
+		const char *lead4 = "\xF0";
+		cb.InsertString(1, lead4, strlen(lead4), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 4);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF16) == 5);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF32) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF32) == 3);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF32) == 4);
+	}
+
+	SECTION("Insert separates new line bytes") {
+		cb.SetUTF8Substance(true);
+		cb.AllocateLineCharacterIndex(SC_LINECHARACTERINDEX_UTF16 | SC_LINECHARACTERINDEX_UTF32);
+
+		bool startSequence = false;
+		// 2 lines of text containing 4 bytes
+		const char *data = "a\r\nb";
+		cb.InsertString(0, data, strlen(data), startSequence);
+
+		// 3 lines of text containing 5 bytes ->
+		// "a\r!\nb"
+		const char *ascii = "!";
+		cb.InsertString(2, ascii, strlen(ascii), startSequence);
+
+		REQUIRE(cb.IndexLineStart(0, SC_LINECHARACTERINDEX_UTF16) == 0);
+		REQUIRE(cb.IndexLineStart(1, SC_LINECHARACTERINDEX_UTF16) == 2);
+		REQUIRE(cb.IndexLineStart(2, SC_LINECHARACTERINDEX_UTF16) == 4);
+		REQUIRE(cb.IndexLineStart(3, SC_LINECHARACTERINDEX_UTF16) == 5);
+	}
+}
diff -Nru scite-4.1.0/scintilla/test/unit/testSplitVector.cxx scite-4.1.2/scintilla/test/unit/testSplitVector.cxx
--- scite-4.1.0/scintilla/test/unit/testSplitVector.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/test/unit/testSplitVector.cxx	2018-09-09 09:00:12.000000000 +0000
@@ -305,8 +305,8 @@
 		for (int i=0; i<10; i+=2) {
 			int len = 10 - i;
 			REQUIRE(len == sv.Length());
-			for (int i=0; i<sv.Length(); i++) {
-				REQUIRE(87 == sv.ValueAt(i));
+			for (int j=0; j<sv.Length(); j++) {
+				REQUIRE(87 == sv.ValueAt(j));
 			}
 			sv.Delete(len-1);
 			sv.Delete(0);
diff -Nru scite-4.1.0/scintilla/version.txt scite-4.1.2/scintilla/version.txt
--- scite-4.1.0/scintilla/version.txt	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/version.txt	2018-10-02 01:35:40.000000000 +0000
@@ -1 +1 @@
-410
+412
diff -Nru scite-4.1.0/scintilla/win32/PlatWin.cxx scite-4.1.2/scintilla/win32/PlatWin.cxx
--- scite-4.1.0/scintilla/win32/PlatWin.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/win32/PlatWin.cxx	2018-09-09 09:00:12.000000000 +0000
@@ -665,7 +665,7 @@
 	hdc = ::CreateCompatibleDC(psurfOther->hdc);
 	hdcOwned = true;
 	bitmap = ::CreateCompatibleBitmap(psurfOther->hdc, width, height);
-	bitmapOld = static_cast<HBITMAP>(::SelectObject(hdc, bitmap));
+	bitmapOld = SelectBitmap(hdc, bitmap);
 	::SetTextAlign(hdc, TA_BASELINE);
 	SetUnicodeMode(psurfOther->unicodeMode);
 	SetDBCSMode(psurfOther->codePage);
@@ -679,7 +679,7 @@
 		penOld = 0;
 	}
 	pen = ::CreatePen(0,1,fore.AsInteger());
-	penOld = static_cast<HPEN>(::SelectObject(hdc, pen));
+	penOld = SelectPen(hdc, pen);
 }
 
 void SurfaceGDI::BrushColor(ColourDesired back) {
@@ -699,9 +699,9 @@
 		const FormatAndMetrics *pfm = FamFromFontID(font_.GetID());
 		PLATFORM_ASSERT(pfm->technology == SCWIN_TECH_GDI);
 		if (fontOld) {
-			::SelectObject(hdc, pfm->hfont);
+			SelectFont(hdc, pfm->hfont);
 		} else {
-			fontOld = static_cast<HFONT>(::SelectObject(hdc, pfm->hfont));
+			fontOld = SelectFont(hdc, pfm->hfont);
 		}
 		font = pfm->hfont;
 	}
@@ -1844,6 +1844,10 @@
 }
 
 ScreenLineLayout::~ScreenLineLayout() {
+	if (textLayout) {
+		textLayout->Release();
+		textLayout = nullptr;
+	}
 }
 
 // Get the position from the provided x
@@ -1888,7 +1892,6 @@
 		);
 	}
 
-	textLayout->Release();
 	size_t pos;
 	if (charPosition) {
 		pos = isTrailingHit ? hitTestMetrics.textPosition : caretMetrics.textPosition;
@@ -1921,8 +1924,6 @@
 		&caretMetrics
 	);
 
-	textLayout->Release();
-
 	return pt.x;
 }
 
@@ -2341,9 +2342,9 @@
 void FlipBitmap(HBITMAP bitmap, int width, int height) {
 	HDC hdc = ::CreateCompatibleDC(NULL);
 	if (hdc) {
-		HGDIOBJ prevBmp = ::SelectObject(hdc, bitmap);
+		HBITMAP prevBmp = SelectBitmap(hdc, bitmap);
 		::StretchBlt(hdc, width - 1, 0, -width, height, hdc, 0, 0, width, height, SRCCOPY);
-		::SelectObject(hdc, prevBmp);
+		SelectBitmap(hdc, prevBmp);
 		::DeleteDC(hdc);
 	}
 }
@@ -3087,13 +3088,13 @@
 	// The list background is mainly erased during painting, but can be a small
 	// unpainted area when at the end of a non-integrally sized list with a
 	// vertical scroll bar
-	RECT rc = { 0, 0, extent.x, extent.y };
+	const RECT rc = { 0, 0, extent.x, extent.y };
 	::FillRect(bitmapDC, &rc, reinterpret_cast<HBRUSH>(COLOR_WINDOW+1));
 	// Paint the entire client area and vertical scrollbar
 	::SendMessage(lb, WM_PRINT, reinterpret_cast<WPARAM>(bitmapDC), PRF_CLIENT|PRF_NONCLIENT);
 	::BitBlt(hDC, 0, 0, extent.x, extent.y, bitmapDC, 0, 0, SRCCOPY);
 	// Select a stock brush to prevent warnings from BoundsChecker
-	::SelectObject(bitmapDC, GetStockFont(WHITE_BRUSH));
+	SelectBrush(bitmapDC, GetStockBrush(WHITE_BRUSH));
 	SelectBitmap(bitmapDC, hBitmapOld);
 	::DeleteDC(bitmapDC);
 	::DeleteObject(hBitmap);
diff -Nru scite-4.1.0/scintilla/win32/scintilla.mak scite-4.1.2/scintilla/win32/scintilla.mak
--- scite-4.1.0/scintilla/win32/scintilla.mak	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/win32/scintilla.mak	2018-09-09 09:00:12.000000000 +0000
@@ -189,6 +189,7 @@
 	$(DIR_O)\LexRegistry.obj \
 	$(DIR_O)\LexRuby.obj \
 	$(DIR_O)\LexRust.obj \
+	$(DIR_O)\LexSAS.obj \
 	$(DIR_O)\LexScriptol.obj \
 	$(DIR_O)\LexSmalltalk.obj \
 	$(DIR_O)\LexSML.obj \
@@ -196,6 +197,7 @@
 	$(DIR_O)\LexSpecman.obj \
 	$(DIR_O)\LexSpice.obj \
 	$(DIR_O)\LexSQL.obj \
+	$(DIR_O)\LexStata.obj \
 	$(DIR_O)\LexSTTXT.obj \
 	$(DIR_O)\LexTACL.obj \
 	$(DIR_O)\LexTADS3.obj \
@@ -698,6 +700,8 @@
 
 $(DIR_O)\LexRust.obj: ..\lexers\LexRust.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexSAS.obj: ..\lexers\LexSAS.cxx $(LEX_HEADERS)
+
 $(DIR_O)\LexScriptol.obj: ..\lexers\LexScriptol.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexSmalltalk.obj: ..\lexers\LexSmalltalk.cxx $(LEX_HEADERS)
@@ -712,6 +716,8 @@
 
 $(DIR_O)\LexSQL.obj: ..\lexers\LexSQL.cxx $(LEX_HEADERS)
 
+$(DIR_O)\LexStata.obj: ..\lexers\LexStata.cxx $(LEX_HEADERS)
+
 $(DIR_O)\LexSTTXT.obj: ..\lexers\LexSTTXT.cxx $(LEX_HEADERS)
 
 $(DIR_O)\LexTACL.obj: ..\lexers\LexTACL.cxx $(LEX_HEADERS)
diff -Nru scite-4.1.0/scintilla/win32/ScintillaWin.cxx scite-4.1.2/scintilla/win32/ScintillaWin.cxx
--- scite-4.1.0/scintilla/win32/ScintillaWin.cxx	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/win32/ScintillaWin.cxx	2018-09-09 09:00:12.000000000 +0000
@@ -1745,8 +1745,9 @@
 				(wParam == SC_TECHNOLOGY_DIRECTWRITERETAIN) ||
 				(wParam == SC_TECHNOLOGY_DIRECTWRITEDC) ||
 				(wParam == SC_TECHNOLOGY_DIRECTWRITE)) {
-				if (technology != static_cast<int>(wParam)) {
-					if (static_cast<int>(wParam) > SC_TECHNOLOGY_DEFAULT) {
+				const int technologyNew = static_cast<int>(wParam);
+				if (technology != technologyNew) {
+					if (technologyNew > SC_TECHNOLOGY_DEFAULT) {
 #if defined(USE_D2D)
 						if (!LoadD2D())
 							// Failed to load Direct2D or DirectWrite so no effect
@@ -1754,11 +1755,13 @@
 #else
 						return 0;
 #endif
+					} else {
+						bidirectional = EditModel::Bidirectional::bidiDisabled;
 					}
 #if defined(USE_D2D)
 					DropRenderTarget();
 #endif
-					technology = static_cast<int>(wParam);
+					technology = technologyNew;
 					// Invalidate all cached information including layout.
 					DropGraphics(true);
 					InvalidateStyleRedraw();
diff -Nru scite-4.1.0/scintilla/win32/ScintRes.rc scite-4.1.2/scintilla/win32/ScintRes.rc
--- scite-4.1.0/scintilla/win32/ScintRes.rc	2018-06-18 23:05:58.000000000 +0000
+++ scite-4.1.2/scintilla/win32/ScintRes.rc	2018-10-02 01:35:40.000000000 +0000
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "4.1.0"
-#define VERSION_WORDS 4, 1, 0, 0
+#define VERSION_SCINTILLA "4.1.2"
+#define VERSION_WORDS 4, 1, 2, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff -Nru scite-4.1.0/scite/doc/PaneAPI.html scite-4.1.2/scite/doc/PaneAPI.html
--- scite-4.1.0/scite/doc/PaneAPI.html	2018-05-06 22:32:10.000000000 +0000
+++ scite-4.1.2/scite/doc/PaneAPI.html	2018-10-02 01:35:45.000000000 +0000
@@ -184,8 +184,6 @@
 	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MOVECARETINSIDEVIEW'>MoveCaretInsideView</a>()<span class="comment"> -- Move the caret inside current view if it's not there already.</span></p>
 	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_POSITIONBEFORE'>PositionBefore</a>(position pos)<span class="comment"> -- Given a valid document position, return the previous position taking code page into account. Returns 0 if passed 0.</span></p>
 	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_POSITIONAFTER'>PositionAfter</a>(position pos)<span class="comment"> -- Given a valid document position, return the next position taking code page into account. Maximum value returned is the last position in the document.</span></p>
-	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_POSITIONRELATIVE'>PositionRelative</a>(position pos, int relative)<span class="comment"> -- Given a valid document position, return a position that differs in a number of characters. Returned value is always between 0 and last position in document.</span></p>
-	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_COUNTCHARACTERS'>CountCharacters</a>(position start, position end)<span class="comment"> -- Count characters between two positions.</span></p>
 	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_TEXTWIDTH'>TextWidth</a>(int style, string text)<span class="comment"> -- Measure the pixel width of some text in a particular style. NUL terminated text argument. Does not handle tab or control characters.</span></p>
 	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_TEXTHEIGHT'>TextHeight</a>(int line)<span class="comment"> -- Retrieve the height of a particular line of text in pixels.</span></p>
 	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETCOLUMN'>Column</a>[position pos] read-only</p>
@@ -201,6 +199,16 @@
 	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MOVESELECTEDLINESUP'>MoveSelectedLinesUp</a>()<span class="comment"> -- Move the selected lines up one line, shifting the line above after the selection</span></p>
 	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_MOVESELECTEDLINESDOWN'>MoveSelectedLinesDown</a>()<span class="comment"> -- Move the selected lines down one line, shifting the line below before the selection</span></p>
 	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMOUSESELECTIONRECTANGULARSWITCH'>MouseSelectionRectangularSwitch</a><span class="comment"> -- Set whether switching to rectangular mode while selecting with the mouse is allowed.</span></p>
+	<h2>By character or UTF-16 code unit</h2>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_POSITIONRELATIVE'>PositionRelative</a>(position pos, int relative)<span class="comment"> -- Given a valid document position, return a position that differs in a number of characters. Returned value is always between 0 and last position in document.</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_COUNTCHARACTERS'>CountCharacters</a>(position start, position end)<span class="comment"> -- Count characters between two positions.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_POSITIONRELATIVECODEUNITS'>PositionRelativeCodeUnits</a>(position pos, int relative)<span class="comment"> -- Given a valid document position, return a position that differs in a number of UTF-16 code units. Returned value is always between 0 and last position in document. The result may point half way (2 bytes) inside a non-BMP character.</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_COUNTCODEUNITS'>CountCodeUnits</a>(position start, position end)<span class="comment"> -- Count code units between two positions.</span></p>
+	<p>int editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_GETLINECHARACTERINDEX'>LineCharacterIndex</a> read-only</p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_ALLOCATELINECHARACTERINDEX'>AllocateLineCharacterIndex</a>(int lineCharacterIndex)<span class="comment"> -- Request line character index be created or its use count increased.</span></p>
+	<p>editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_RELEASELINECHARACTERINDEX'>ReleaseLineCharacterIndex</a>(int lineCharacterIndex)<span class="comment"> -- Decrease use count of line character index and remove if 0.</span></p>
+	<p>int editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_LINEFROMINDEXPOSITION'>LineFromIndexPosition</a>(position pos, int lineCharacterIndex)<span class="comment"> -- Retrieve the document line containing a position measured in index units.</span></p>
+	<p>position editor:<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_INDEXPOSITIONFROMLINE'>IndexPositionFromLine</a>(int line, int lineCharacterIndex)<span class="comment"> -- Retrieve the position measured in index units at the start of a document line.</span></p>
 	<h2>Multiple Selection and Virtual Space</h2>
 	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETMULTIPLESELECTION'>MultipleSelection</a><span class="comment"> -- Set whether multiple selections can be made</span></p>
 	<p>bool editor.<a href='https://www.scintilla.org/ScintillaDoc.html#SCI_SETADDITIONALSELECTIONTYPING'>AdditionalSelectionTyping</a><span class="comment"> -- Set whether typing can be performed into multiple selections</span></p>
diff -Nru scite-4.1.0/scite/doc/SciTEDirector.html scite-4.1.2/scite/doc/SciTEDirector.html
--- scite-4.1.0/scite/doc/SciTEDirector.html	2017-08-16 07:34:20.000000000 +0000
+++ scite-4.1.2/scite/doc/SciTEDirector.html	2018-09-09 09:00:25.000000000 +0000
@@ -128,7 +128,7 @@
 	format of project files. Instead, SciTE has an interface that can be used by project
 	managers or similar applications to control SciTE. Any application that controls SciTE is
 	referred to as a "Director".</p>
-	<p>The current Director interface only works on Windows. In the future, it should be
+	<p>The current Director interface only works on Windows and GTK+/Linux. In the future, it should be
 	possible to replace the low level interface and so make this interface available on other
 	platforms.</p>
 	<p>There is currently one director application,
@@ -213,10 +213,10 @@
     <h3>
        Low level interface on GTK+.
     </h3>
-	<p>This is not yet implemented.
-	The proposed design uses an input fifo for each application supporting the director
-	interface located in /tmp with a name using a pattern such as
-	"/tmp/SciTE&lt;PID&gt;.director".
+	<p>An input fifo for each application supporting the director
+	interface located in the temporary directory (obtained through GLib g_get_tmp_dir() call),
+	with a name using a pattern such as
+	"/tmp/SciTE.&lt;PID&gt;.in".
 	This allows enumerating all active director interfaces and also opening
 	a specific interface when the fifo name has been communicated through some
 	other means such as a command line argument or an identity: command.</p>
diff -Nru scite-4.1.0/scite/doc/SciTEDownload.html scite-4.1.2/scite/doc/SciTEDownload.html
--- scite-4.1.0/scite/doc/SciTEDownload.html	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/doc/SciTEDownload.html	2018-10-02 01:35:45.000000000 +0000
@@ -30,9 +30,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/scite410.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scite412.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scite410.tgz">
+	<a href="https://www.scintilla.org/scite412.tgz">
           GTK+/Linux</a>&nbsp;&nbsp;</font>
         </td>
       </tr>
@@ -45,7 +45,7 @@
       containing very few restrictions.
     </p>
     <h2>
-       Release 4.1.0
+       Release 4.1.2
     </h2>
     <h3>
        Source Code
@@ -53,8 +53,8 @@
        The source code package contains all of the source code for Scintilla and SciTE but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/scite410.zip">zip format</a> (2700K) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scite410.tgz">tgz format</a> (2300K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scite412.zip">zip format</a> (2700K) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scite412.tgz">tgz format</a> (2300K) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h3>
@@ -68,13 +68,13 @@
        is no longer tested.
     </p>
     <p>
-       A <a href="https://www.scintilla.org/wscite410.zip">full download</a> (1550K) includes the SciTE executable, any required DLLs,
+       A <a href="https://www.scintilla.org/wscite412.zip">full download</a> (1550K) includes the SciTE executable, any required DLLs,
       configuration files and documentation. After downloading the file, unzip it, and run
       SciTE.EXE. The files required to run SciTE are SciTE.EXE, SciLexer.DLL, and
       SciTEGlobal.properties.
     </p>
     <p>
-       A <a href="https://www.scintilla.org/Sc410.exe">single file executable called Sc1</a> (1000K) does not need any DLL or
+       A <a href="https://www.scintilla.org/Sc412.exe">single file executable called Sc1</a> (1000K) does not need any DLL or
       properties files as these are linked into the executable. You may still create properties
       files if you wish.
       Sc1.exe has been compressed with the
@@ -101,7 +101,7 @@
       If the target system is 64-bit, you may also need to build SciTE from source.
     </p>
     <p>
-       A <a href="https://www.scintilla.org/gscite410.tgz">full download</a> (1400K) includes the 32-bit SciTE executable,
+       A <a href="https://www.scintilla.org/gscite412.tgz">full download</a> (1400K) includes the 32-bit SciTE executable,
       configuration files and documentation.
       After downloading the file, gunzip and untar it, and run
       SciTE. The files required to run SciTE are SciTE which is best located on the path
diff -Nru scite-4.1.0/scite/doc/SciTEExtension.html scite-4.1.2/scite/doc/SciTEExtension.html
--- scite-4.1.0/scite/doc/SciTEExtension.html	2017-08-16 07:34:20.000000000 +0000
+++ scite-4.1.2/scite/doc/SciTEExtension.html	2018-09-09 09:00:25.000000000 +0000
@@ -45,7 +45,7 @@
 	controlled by another process through an IPC mechanism.</p>
 	<p>There are two example extensions.
 	The <a href="SciTEDirector.html">SciTE Director Interface</a> allows
-	SciTE on Windows to be controlled by an external application such as a
+	SciTE to be controlled by an external application such as a
 	project manager.
 	The <a href="SciTELua.html">SciTE Lua Scripting Extension</a> is an
 	integration of the Lua scripting language into SciTE, done using the Extension
@@ -120,11 +120,11 @@
 	<div class="example">
 	enum Pane { paneEditor=1, paneOutput=2, paneFindOutput=3 };<br />
 	sptr_t Send(Pane p, unsigned int msg, uptr_t wParam=0, sptr_t lParam=0);<br />
-	char *Range(Pane p, int start, int end);<br />
+	std::string Range(Pane p, int start, int end);<br />
 	void Remove(Pane p, int start, int end);<br />
 	void Insert(Pane p, int pos, const char *s);<br />
 	void Trace(const char *s);<br />
-	char *Property(const char *key);<br />
+	std::string Property(const char *key);<br />
 	void SetProperty(const char *key, const char *val);<br />
 	uptr_t GetInstance();<br />
 	void ShutDown();<br />
@@ -138,11 +138,11 @@
 	a future feature where a third pane may be used for the output of search
 	commands. This is currently mapped to the output pane.</p>
 	<p>Send allows sending messages to the Scintilla control contained in each pane.</p>
-	<p>Range retrieves text from the pane. This must be deleted with delete[].
+	<p>Range retrieves text from the pane.
 	Remove and Insert are used to remove and insert text in a pane.</p>
 	<p>Trace displays a string at the end of the output pane.</p>
 	<p>SciTE's properties can be read and written with Property and
-	SetProperty. The result from Property should be deleted with delete[].</p>
+	SetProperty.</p>
 	<p>GetInstance is Windows specific and returns the HINSTANCE of
 	the application which is needed when accessing platform facilities.</p>
 	<p>ShutDown is equivalent to the user choosing the Quit menu item.
diff -Nru scite-4.1.0/scite/doc/SciTE.html scite-4.1.2/scite/doc/SciTE.html
--- scite-4.1.0/scite/doc/SciTE.html	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/doc/SciTE.html	2018-10-02 01:35:45.000000000 +0000
@@ -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="20180619" />
+    <meta name="Date.Modified" content="20181002" />
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <script type="text/javascript">
    	function IsRemote() {
@@ -56,8 +56,8 @@
           X</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 4.1.0<br />
-           Site last modified June 19 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,10 +72,11 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 4.1.2 drops menukey feature on Win32 to fix bugs.</li>
+      <li>Version 4.1.1 contains minor fixes.</li>
       <li>Version 4.1.0 handles invalid DBCS files better.</li>
       <li>Version 4.0.5 supports the EditorConfig format for sharing basic configuration with other editors.</li>
       <li>Version 4.0.4 allows more complex filepatterns with '?', '*' not at beginning or end, and multiple '*'.</li>
-      <li>Version 4.0.3 fixes some bugs.</li>
     </ul>
     <ul id="menu">
       <li><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
@@ -115,7 +116,7 @@
 <p>You can <a href="https://www.scintilla.org/SciTEDownload.html">download Scintilla and SciTE.</a></p>
 </noscript>
     <p>
-       For OS X, there is a commercial version of SciTE available from the <a href="https://www.scintilla.org/SciTE-OSX.html">Mac App Store</a>.
+       For macOS, there is a commercial version of SciTE available from the <a href="https://www.scintilla.org/SciTE-OSX.html">Mac App Store</a>.
     </p>
     <p>
        There are some <a href="http://code.google.com/p/scite-files/wiki/Customization">extra configuration files</a> that can
diff -Nru scite-4.1.0/scite/doc/SciTELua.html scite-4.1.2/scite/doc/SciTELua.html
--- scite-4.1.0/scite/doc/SciTELua.html	2017-08-16 07:34:20.000000000 +0000
+++ scite-4.1.2/scite/doc/SciTELua.html	2018-09-09 09:00:25.000000000 +0000
@@ -293,7 +293,7 @@
 <h4>Scripting user interfaces with strips</h4>
 <p>Simple user interfaces may be defined from Lua as strips similar to
 the find and replace strips. An example looks like<br />
-<img src="http://scintilla.org/UserStrip.png"></img></p>
+<img src="https://scintilla.org/UserStrip.png"></img></p>
 
 <p>Strips are shown with StripShow which takes a string describing
 the user interface then builds and displays it as a strip at the
Binary files /tmp/tmpKBCku7/5RLwp5IvhI/scite-4.1.0/scite/doc/UserStrip.png and /tmp/tmpKBCku7/y3oO_izdtg/scite-4.1.2/scite/doc/UserStrip.png differ
diff -Nru scite-4.1.0/scite/gtk/DirectorExtension.cxx scite-4.1.2/scite/gtk/DirectorExtension.cxx
--- scite-4.1.0/scite/gtk/DirectorExtension.cxx	2018-04-20 03:39:46.000000000 +0000
+++ scite-4.1.2/scite/gtk/DirectorExtension.cxx	2018-09-09 09:00:25.000000000 +0000
@@ -107,20 +107,19 @@
 }
 
 static void AddSendPipe(int fd, const char *name) {
-	PipeEntry entry;
-	entry.fd = fd;
-	if (name)
-		entry.name = strdup(name);
-	else
-		entry.name = NULL;
 	if (SendPipeAvailable()) {
-		s_send_pipes[s_send_cnt++] = entry;
+		PipeEntry &entry = s_send_pipes[s_send_cnt++];
+		entry.fd = fd;
+		if (name)
+			entry.name = strdup(name);
+		else
+			entry.name = NULL;
 	}
 }
 
 static void RemoveSendPipes() {
 	for (int i = 0; i < s_send_cnt; ++i) {
-		PipeEntry entry = s_send_pipes[i];
+		PipeEntry &entry = s_send_pipes[i];
 		close(entry.fd);
 		if (entry.name)
 			remove(entry.name);
diff -Nru scite-4.1.0/scite/gtk/DirectorExtension.h scite-4.1.2/scite/gtk/DirectorExtension.h
--- scite-4.1.0/scite/gtk/DirectorExtension.h	2017-08-16 07:34:20.000000000 +0000
+++ scite-4.1.2/scite/gtk/DirectorExtension.h	2018-09-09 09:00:25.000000000 +0000
@@ -15,27 +15,27 @@
 	static DirectorExtension &Instance();
 
 	// Implement the Extension interface
-	virtual bool Initialise(ExtensionAPI *host_);
-	virtual bool Finalise();
-	virtual bool Clear();
-	virtual bool Load(const char *filename);
+	bool Initialise(ExtensionAPI *host_) override;
+	bool Finalise() override;
+	bool Clear() override;
+	bool Load(const char *filename) override;
 
-	virtual bool OnOpen(const char *path);
-	virtual bool OnSwitchFile(const char *path);
-	virtual bool OnSave(const char *path);
-	virtual bool OnChar(char ch);
-	virtual bool OnExecute(const char *cmd);
-	virtual bool OnSavePointReached();
-	virtual bool OnSavePointLeft();
-	virtual bool OnStyle(unsigned int startPos, int lengthDoc, int initStyle, StyleWriter *styler);
-	virtual bool OnDoubleClick();
-	virtual bool OnUpdateUI();
-	virtual bool OnMarginClick();
-	virtual bool OnMacro(const char *command, const char *params);
+	bool OnOpen(const char *path) override;
+	bool OnSwitchFile(const char *path) override;
+	bool OnSave(const char *path) override;
+	bool OnChar(char ch) override;
+	bool OnExecute(const char *cmd) override;
+	bool OnSavePointReached() override;
+	bool OnSavePointLeft() override;
+	bool OnStyle(unsigned int startPos, int lengthDoc, int initStyle, StyleWriter *styler) override;
+	bool OnDoubleClick() override;
+	bool OnUpdateUI() override;
+	bool OnMarginClick() override;
+	bool OnMacro(const char *command, const char *params) override;
 
-	virtual bool SendProperty(const char *prop);
-	virtual bool OnClose(const char *path);
-	virtual bool NeedsOnClose();
+	bool SendProperty(const char *prop) override;
+	bool OnClose(const char *path) override;
+	bool NeedsOnClose() override;
 
 	// Allow messages through to extension
 	void HandleStringMessage(const char *message);
diff -Nru scite-4.1.0/scite/gtk/makefile scite-4.1.2/scite/gtk/makefile
--- scite-4.1.0/scite/gtk/makefile	2018-05-06 22:32:10.000000000 +0000
+++ scite-4.1.2/scite/gtk/makefile	2018-09-09 09:00:25.000000000 +0000
@@ -136,7 +136,7 @@
 
 	$(INSTALL) -m 755 $(PROG) $(DESTDIR)$(bindir)
 
-	for files in $(srcdir)/../src/*.properties $(srcdir)/../doc/*.html $(srcdir)/../doc/SciTEIco.png $(srcdir)/../doc/PrintHi.png; \
+	for files in $(srcdir)/../src/*.properties $(srcdir)/../doc/*.html $(srcdir)/../doc/SciTEIco.png $(srcdir)/../doc/PrintHi.png $(srcdir)/../doc/SciTEIndicators.png; \
 	do \
 		$(INSTALL) -m 644 $$files $(DESTDIR)$(SYSCONF_PATH); \
 	done
diff -Nru scite-4.1.0/scite/gtk/SciTE.desktop scite-4.1.2/scite/gtk/SciTE.desktop
--- scite-4.1.0/scite/gtk/SciTE.desktop	2017-10-22 21:48:09.000000000 +0000
+++ scite-4.1.2/scite/gtk/SciTE.desktop	2018-09-09 09:00:25.000000000 +0000
@@ -2,15 +2,18 @@
 Version=1.0
 Name=SciTE Text Editor
 Name[da]=SciTE-tekstredigering
+Name[de]=SciTE-Textbearbeitung
 Name[es]=Editor de textos SciTE
 Name[fr]=Éditeur de texte SciTE
 Name[ru]=Текстовый редактор SciTE
 Comment=Edit your source files
 Comment[da]=Rediger dine kildefiler
+Comment[de]=Quelltextdateien bearbeiten
 Comment[es]=Edita especializado para programación
 Comment[fr]=Éditer des fichiers sources
 Comment[ru]=Редактор исходных кодов
 GenericName=Text Editor
+GenericName[de]=Textbearbeitung
 Type=Application
 Exec=SciTE %F
 Icon=Sci48M
diff -Nru scite-4.1.0/scite/gtk/SciTEGTK.cxx scite-4.1.2/scite/gtk/SciTEGTK.cxx
--- scite-4.1.0/scite/gtk/SciTEGTK.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/gtk/SciTEGTK.cxx	2018-10-02 01:35:45.000000000 +0000
@@ -284,7 +284,7 @@
 	return (keyval > 0) ? (keyval | (modsInKey<<16)) : 0;
 }
 
-bool SciTEKeys::MatchKeyCode(long parsedKeyCode, int keyval, int modifiers) {
+bool SciTEKeys::MatchKeyCode(long parsedKeyCode, int keyval, int modifiers) noexcept {
 	return parsedKeyCode && !(0xFFFF0000 & (keyval | modifiers)) && (parsedKeyCode == (keyval | (modifiers<<16)));
 }
 
diff -Nru scite-4.1.0/scite/src/Credits.cxx scite-4.1.2/scite/src/Credits.cxx
--- scite-4.1.0/scite/src/Credits.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/src/Credits.cxx	2018-10-02 01:35:45.000000000 +0000
@@ -101,6 +101,7 @@
             "Willy Devaux",
             "David Clain",
             "Brendon Yenson",
+            "Philipp",
             "Vamsi Potluru http://www.baanboard.com",
             "Praveen Ambekar",
             "Alan Knowles",
@@ -436,6 +437,9 @@
             "Giuseppe Corbelli",
             "Andreas R\303\266nnquist",
             "Henrik Hank",
+            "Luke Rasmussen",
+            "maboroshin",
+            "Gokul Krishnan",
 
 //--Autogenerated -- end of automatically generated section
         };
@@ -485,7 +489,7 @@
 		mult(109),
 		incr(853),
 		modulus(4096),
-		randomValue(time(0) % modulus),
+		randomValue(time(nullptr) % modulus),
 		r(NextRandom() % 256),
 		g(NextRandom() % 256),
 		b(NextRandom() % 256) {
diff -Nru scite-4.1.0/scite/src/css.properties scite-4.1.2/scite/src/css.properties
--- scite-4.1.0/scite/src/css.properties	2017-08-16 07:34:20.000000000 +0000
+++ scite-4.1.2/scite/src/css.properties	2018-09-09 09:00:25.000000000 +0000
@@ -7,6 +7,8 @@
 lexer.*.css=css
 *language.css=CSS|css||
 
+*source.patterns.css=*.css;
+
 indent.size.*.css=4
 tab.size.*.css=4
 use.tabs.*.css=1
diff -Nru scite-4.1.0/scite/src/Embedded.properties scite-4.1.2/scite/src/Embedded.properties
--- scite-4.1.0/scite/src/Embedded.properties	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/src/Embedded.properties	2018-10-02 01:35:45.000000000 +0000
@@ -241,7 +241,7 @@
 
 imports.exclude=abaqus asl asn1 au3 ave avs baan blitzbasic bullant \
 cmake cobol coffeescript csound ecl eiffel erlang escript flagship forth freebasic \
-gap haskell hex inno json kix latex lot lout \
+gap haskell hex inno kix latex lot lout \
 markdown maxima metapost mmixal modula3 nimrod nncrontab nsis \
 opal oscript pov powerpro powershell ps purebasic r rebol rust \
 scriptol smalltalk sorcins spice specman \
@@ -2758,6 +2758,8 @@
 lexer.*.css=css
 *language.css=CSS|css||
 
+*source.patterns.css=*.css;
+
 indent.size.*.css=4
 tab.size.*.css=4
 use.tabs.*.css=1
@@ -6721,9 +6723,14 @@
 style.pov.16=$(colour.keyword),back:#E0E0E0
 braces.pov.style=4
 
-command.compile.*.pov=pvengine.exe $(FileName)
-command.build.*.pov=
-command.go.*.pov=pvengine.exe $(FileName)
+if PLAT_WIN
+	command.compile.*.pov=pvengine.exe $(FileName)
+	command.build.*.pov=
+	command.go.*.pov=pvengine.exe $(FileName)
+if PLAT_GTK
+	command.compile.*.pov=povray +P $(FileName).pov
+	command.build.*.pov=
+	command.go.*.pov=povray +P $(FileName).pov
 
 if PLAT_WIN
 	command.help.$(file.patterns.pov)=$(CurrentWord)!D:\Programmes\UImages\POV-Ray 3.5\help\povray35.chm
@@ -7195,10 +7202,10 @@
 
 module r
 
-file.patterns.r=*.R;*.rsource;*.S;
+file.patterns.r=*.r;*.R;*.rsource;*.S
 file.patterns.r.like=$(file.patterns.r)
 
-filter.r=R and S+ (R S rsouce)|$(file.patterns.r)|
+filter.r=R and S+ (R S rsource)|$(file.patterns.r)|
 
 *filter.r=$(filter.r)
 
diff -Nru scite-4.1.0/scite/src/ExportHTML.cxx scite-4.1.2/scite/src/ExportHTML.cxx
--- scite-4.1.0/scite/src/ExportHTML.cxx	2018-04-20 03:39:46.000000000 +0000
+++ scite-4.1.2/scite/src/ExportHTML.cxx	2018-09-09 09:00:25.000000000 +0000
@@ -78,7 +78,7 @@
 	styleIsUsed[STYLE_DEFAULT] = true;
 
 	FILE *fp = saveName.Open(GUI_TEXT("wt"));
-	bool failedWrite = fp == NULL;
+	bool failedWrite = fp == nullptr;
 	if (fp) {
 		fputs("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n", fp);
 		fputs("<html xmlns=\"http://www.w3.org/1999/xhtml\">\n", fp);
diff -Nru scite-4.1.0/scite/src/ExportPDF.cxx scite-4.1.2/scite/src/ExportPDF.cxx
--- scite-4.1.0/scite/src/ExportPDF.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/src/ExportPDF.cxx	2018-09-09 09:00:25.000000000 +0000
@@ -194,7 +194,7 @@
 			stylePrev = STYLE_DEFAULT;
 			leading = PDF_FONTSIZE_DEFAULT * PDF_SPACING_DEFAULT;
 			buffer[0] = '\0';
-			oT = NULL;
+			oT = nullptr;
 			fontSize = 0;
 			fontSet = PDF_FONT_DEFAULT;
 			pageWidth = 100;
diff -Nru scite-4.1.0/scite/src/ExportRTF.cxx scite-4.1.2/scite/src/ExportRTF.cxx
--- scite-4.1.0/scite/src/ExportRTF.cxx	2018-05-06 22:32:10.000000000 +0000
+++ scite-4.1.2/scite/src/ExportRTF.cxx	2018-09-09 09:00:25.000000000 +0000
@@ -283,7 +283,7 @@
 
 void SciTEBase::SaveToRTF(const FilePath &saveName, int start, int end) {
 	FILE *fp = saveName.Open(GUI_TEXT("wt"));
-	bool failedWrite = fp == NULL;
+	bool failedWrite = fp == nullptr;
 	if (fp) {
 		try {
 			std::ostringstream oss;
diff -Nru scite-4.1.0/scite/src/ExportTEX.cxx scite-4.1.2/scite/src/ExportTEX.cxx
--- scite-4.1.0/scite/src/ExportTEX.cxx	2018-04-20 03:39:46.000000000 +0000
+++ scite-4.1.2/scite/src/ExportTEX.cxx	2018-09-09 09:00:25.000000000 +0000
@@ -120,7 +120,7 @@
 	styleIsUsed[STYLE_DEFAULT] = true;
 
 	FILE *fp = saveName.Open(GUI_TEXT("wt"));
-	bool failedWrite = fp == NULL;
+	bool failedWrite = fp == nullptr;
 	if (fp) {
 		fputs("\\documentclass[a4paper]{article}\n"
 		      "\\usepackage[a4paper,margin=2cm]{geometry}\n"
diff -Nru scite-4.1.0/scite/src/ExportXML.cxx scite-4.1.2/scite/src/ExportXML.cxx
--- scite-4.1.0/scite/src/ExportXML.cxx	2018-04-20 03:39:46.000000000 +0000
+++ scite-4.1.2/scite/src/ExportXML.cxx	2018-09-09 09:00:25.000000000 +0000
@@ -88,7 +88,7 @@
 	TextReader acc(wEditor);
 
 	FILE *fp = saveName.Open(GUI_TEXT("wt"));
-	bool failedWrite = fp == NULL;
+	bool failedWrite = fp == nullptr;
 
 	if (fp) {
 
@@ -97,7 +97,7 @@
 
 		fprintf(fp, "<?xml version='1.0' encoding='%s'?>\n", (codePage == SC_CP_UTF8) ? "utf-8" : "ascii");
 
-		fputs("<document xmlns='http://www.scintila.org/scite.rng'", fp);
+		fputs("<document xmlns='http://www.scintilla.org/scite.rng'", fp);
 		fprintf(fp, " filename='%s'",
 		        filePath.Name().AsUTF8().c_str());
 		fprintf(fp, " type='%s'", "unknown");
diff -Nru scite-4.1.0/scite/src/FilePath.cxx scite-4.1.2/scite/src/FilePath.cxx
--- scite-4.1.0/scite/src/FilePath.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/src/FilePath.cxx	2018-09-09 09:00:25.000000000 +0000
@@ -326,7 +326,7 @@
 	// so use the OS.
 	GUI::gui_char absPath[2000];
 	absPath[0] = '\0';
-	GUI::gui_char *fileBit = 0;
+	GUI::gui_char *fileBit = nullptr;
 	::GetFullPathNameW(AsInternal(), sizeof(absPath)/sizeof(absPath[0]), absPath, &fileBit);
 	return FilePath(absPath);
 #else
@@ -412,7 +412,7 @@
 	if (IsSet()) {
 		return fopen(fileName.c_str(), mode);
 	} else {
-		return NULL;
+		return nullptr;
 	}
 }
 
@@ -518,7 +518,7 @@
 
 #ifdef _WIN32
 void Lowercase(GUI::gui_string &s) {
-	const int chars = ::LCMapString(LOCALE_SYSTEM_DEFAULT, LCMAP_LOWERCASE, s.c_str(), static_cast<int>(s.size())+1, NULL, 0);
+	const int chars = ::LCMapString(LOCALE_SYSTEM_DEFAULT, LCMAP_LOWERCASE, s.c_str(), static_cast<int>(s.size())+1, nullptr, 0);
 	std::vector<wchar_t> vc(chars);
 	::LCMapString(LOCALE_SYSTEM_DEFAULT, LCMAP_LOWERCASE, s.c_str(), static_cast<int>(s.size())+1, &vc[0], chars);
 	s = &vc[0];
@@ -591,7 +591,7 @@
 		return false;
 	}
 	typedef DWORD (STDAPICALLTYPE* GetLongSig)(const GUI::gui_char* lpszShortPath, GUI::gui_char* lpszLongPath, DWORD cchBuffer);
-	static GetLongSig pfnGetLong = NULL;
+	static GetLongSig pfnGetLong = nullptr;
 	static bool kernelTried = false;
 
 	if (!kernelTried) {
@@ -658,7 +658,7 @@
 std::string CommandExecute(const GUI::gui_char *command, const GUI::gui_char *directoryForRun) {
 	std::string output;
 #ifdef _WIN32
-	SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), NULL, TRUE};
+	SECURITY_ATTRIBUTES sa = {sizeof(SECURITY_ATTRIBUTES), nullptr, TRUE};
 
 	HANDLE hPipeWrite = NULL;
 	HANDLE hPipeRead = NULL;
@@ -683,7 +683,7 @@
 	// Make child process use hPipeWrite as standard out, and make
 	// sure it does not show on screen.
 	STARTUPINFOW si = {
-			     sizeof(STARTUPINFO), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+			     sizeof(STARTUPINFO), nullptr, nullptr, nullptr, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, nullptr, 0, 0, 0
 			 };
 	si.dwFlags = STARTF_USESHOWWINDOW | STARTF_USESTDHANDLES;
 	si.wShowWindow = SW_HIDE;
@@ -696,12 +696,12 @@
 	std::vector<wchar_t> vwcCommand(command, command + wcslen(command) + 1);
 
 	const BOOL running = ::CreateProcessW(
-			  NULL,
+			  nullptr,
 			  &vwcCommand[0],
-			  NULL, NULL,
+			  nullptr, nullptr,
 			  TRUE, CREATE_NEW_PROCESS_GROUP,
-			  NULL,
-			  (directoryForRun && directoryForRun[0]) ? directoryForRun : 0,
+			  nullptr,
+			  (directoryForRun && directoryForRun[0]) ? directoryForRun : nullptr,
 			  &si, &pi);
 
 	if (running && pi.hProcess && pi.hThread) {
@@ -714,13 +714,13 @@
 
 		if (::PeekNamedPipe(hPipeRead, buffer, sizeof(buffer), &bytesRead, &bytesAvail, NULL)) {
 			if (bytesAvail > 0) {
-				int bTest = ::ReadFile(hPipeRead, buffer, sizeof(buffer), &bytesRead, NULL);
+				int bTest = ::ReadFile(hPipeRead, buffer, sizeof(buffer), &bytesRead, nullptr);
 				while (bTest && bytesRead) {
 					output.append(buffer, buffer+bytesRead);
 					bytesRead = 0;
 					if (::PeekNamedPipe(hPipeRead, buffer, sizeof(buffer), &bytesRead, &bytesAvail, NULL)) {
 						if (bytesAvail) {
-							bTest = ::ReadFile(hPipeRead, buffer, sizeof(buffer), &bytesRead, NULL);
+							bTest = ::ReadFile(hPipeRead, buffer, sizeof(buffer), &bytesRead, nullptr);
 						}
 					}
 				}
diff -Nru scite-4.1.0/scite/src/FileWorker.cxx scite-4.1.2/scite/src/FileWorker.cxx
--- scite-4.1.0/scite/src/FileWorker.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/src/FileWorker.cxx	2018-09-09 09:00:25.000000000 +0000
@@ -84,7 +84,7 @@
 			lenFile = fread(&data[0], 1, blockSize, fp);
 			if ((lenFile == 0) && (err == 0)) {
 				// Handle case where convert is holding a lead surrogate but no more data
-				const size_t lenFileTrail = convert.convert(NULL, lenFile);
+				const size_t lenFileTrail = convert.convert(nullptr, lenFile);
 				if (lenFileTrail) {
 					const char *dataTrail = convert.getNewBuf();
 					err = pLoader->AddData(dataTrail, static_cast<int>(lenFileTrail));
@@ -92,7 +92,7 @@
 			}
 		}
 		fclose(fp);
-		fp = 0;
+		fp = nullptr;
 		unicodeMode = static_cast<UniMode>(
 		            static_cast<int>(convert.getEncoding()));
 		// Check the first two lines for coding cookies
@@ -107,7 +107,7 @@
 void FileLoader::Cancel() {
 	FileWorker::Cancel();
 	pLoader->Release();
-	pLoader = 0;
+	pLoader = nullptr;
 }
 
 FileStorer::FileStorer(WorkerListener *pListener_, const char *documentBytes_, const FilePath &path_,
diff -Nru scite-4.1.0/scite/src/IFaceTable.cxx scite-4.1.2/scite/src/IFaceTable.cxx
--- scite-4.1.0/scite/src/IFaceTable.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/src/IFaceTable.cxx	2018-09-09 09:00:25.000000000 +0000
@@ -1726,6 +1726,22 @@
 	{"SCE_R_OTHERKWORD",4},
 	{"SCE_R_STRING",6},
 	{"SCE_R_STRING2",7},
+	{"SCE_SAS_BLOCK_KEYWORD",13},
+	{"SCE_SAS_COMMENT",1},
+	{"SCE_SAS_COMMENTBLOCK",3},
+	{"SCE_SAS_COMMENTLINE",2},
+	{"SCE_SAS_DEFAULT",0},
+	{"SCE_SAS_GLOBAL_MACRO",10},
+	{"SCE_SAS_IDENTIFIER",6},
+	{"SCE_SAS_MACRO",11},
+	{"SCE_SAS_MACRO_FUNCTION",14},
+	{"SCE_SAS_MACRO_KEYWORD",12},
+	{"SCE_SAS_NUMBER",4},
+	{"SCE_SAS_OPERATOR",5},
+	{"SCE_SAS_STATEMENT",15},
+	{"SCE_SAS_STRING",7},
+	{"SCE_SAS_TYPE",8},
+	{"SCE_SAS_WORD",9},
 	{"SCE_SCRIPTOL_CHARACTER",8},
 	{"SCE_SCRIPTOL_CLASSNAME",14},
 	{"SCE_SCRIPTOL_COMMENTBLOCK",5},
@@ -1829,6 +1845,18 @@
 	{"SCE_SQL_USER4",22},
 	{"SCE_SQL_WORD",5},
 	{"SCE_SQL_WORD2",16},
+	{"SCE_STATA_COMMENT",1},
+	{"SCE_STATA_COMMENTBLOCK",3},
+	{"SCE_STATA_COMMENTLINE",2},
+	{"SCE_STATA_DEFAULT",0},
+	{"SCE_STATA_GLOBAL_MACRO",10},
+	{"SCE_STATA_IDENTIFIER",6},
+	{"SCE_STATA_MACRO",11},
+	{"SCE_STATA_NUMBER",4},
+	{"SCE_STATA_OPERATOR",5},
+	{"SCE_STATA_STRING",7},
+	{"SCE_STATA_TYPE",8},
+	{"SCE_STATA_WORD",9},
 	{"SCE_STTXT_CHARACTER",11},
 	{"SCE_STTXT_COMMENT",1},
 	{"SCE_STTXT_COMMENTLINE",2},
@@ -2134,6 +2162,7 @@
 	{"SCI_GETLENGTH",2006},
 	{"SCI_GETLEXER",4002},
 	{"SCI_GETLEXERLANGUAGE",4012},
+	{"SCI_GETLINECHARACTERINDEX",2710},
 	{"SCI_GETLINECOUNT",2154},
 	{"SCI_GETLINEENDPOSITION",2136},
 	{"SCI_GETLINEENDTYPESACTIVE",2658},
@@ -2545,6 +2574,7 @@
 	{"SCLEX_REGISTRY",115},
 	{"SCLEX_RUBY",22},
 	{"SCLEX_RUST",111},
+	{"SCLEX_SAS",125},
 	{"SCLEX_SCRIPTOL",33},
 	{"SCLEX_SMALLTALK",72},
 	{"SCLEX_SML",97},
@@ -2553,6 +2583,7 @@
 	{"SCLEX_SPICE",78},
 	{"SCLEX_SQL",7},
 	{"SCLEX_SREC",117},
+	{"SCLEX_STATA",124},
 	{"SCLEX_STTXT",109},
 	{"SCLEX_TACL",93},
 	{"SCLEX_TADS3",70},
@@ -2684,6 +2715,9 @@
 	{"SC_IV_NONE",0},
 	{"SC_IV_REAL",1},
 	{"SC_LASTSTEPINUNDOREDO",0x100},
+	{"SC_LINECHARACTERINDEX_NONE",0},
+	{"SC_LINECHARACTERINDEX_UTF16",2},
+	{"SC_LINECHARACTERINDEX_UTF32",1},
 	{"SC_LINE_END_TYPE_DEFAULT",0},
 	{"SC_LINE_END_TYPE_UNICODE",1},
 	{"SC_MARGINOPTION_NONE",0},
@@ -2841,6 +2875,7 @@
 	{"AddUndoAction", 2560, iface_void, {iface_int, iface_int}},
 	{"Allocate", 2446, iface_void, {iface_int, iface_void}},
 	{"AllocateExtendedStyles", 2553, iface_int, {iface_int, iface_void}},
+	{"AllocateLineCharacterIndex", 2711, iface_void, {iface_int, iface_void}},
 	{"AllocateSubStyles", 4020, iface_int, {iface_int, iface_int}},
 	{"AnnotationClearAll", 2547, iface_void, {iface_void, iface_void}},
 	{"AppendText", 2282, iface_void, {iface_length, iface_string}},
@@ -2896,6 +2931,7 @@
 	{"CopyRange", 2419, iface_void, {iface_position, iface_position}},
 	{"CopyText", 2420, iface_void, {iface_length, iface_string}},
 	{"CountCharacters", 2633, iface_int, {iface_position, iface_position}},
+	{"CountCodeUnits", 2715, iface_int, {iface_position, iface_position}},
 	{"CreateDocument", 2375, iface_int, {iface_int, iface_int}},
 	{"CreateLoader", 2632, iface_int, {iface_int, iface_int}},
 	{"Cut", 2177, iface_void, {iface_void, iface_void}},
@@ -2960,6 +2996,7 @@
 	{"HomeRectExtend", 2430, iface_void, {iface_void, iface_void}},
 	{"HomeWrap", 2349, iface_void, {iface_void, iface_void}},
 	{"HomeWrapExtend", 2450, iface_void, {iface_void, iface_void}},
+	{"IndexPositionFromLine", 2714, iface_position, {iface_int, iface_int}},
 	{"IndicatorAllOnFor", 2506, iface_int, {iface_position, iface_void}},
 	{"IndicatorClearRange", 2505, iface_void, {iface_position, iface_int}},
 	{"IndicatorEnd", 2509, iface_int, {iface_int, iface_position}},
@@ -2982,6 +3019,7 @@
 	{"LineEndRectExtend", 2432, iface_void, {iface_void, iface_void}},
 	{"LineEndWrap", 2451, iface_void, {iface_void, iface_void}},
 	{"LineEndWrapExtend", 2452, iface_void, {iface_void, iface_void}},
+	{"LineFromIndexPosition", 2713, iface_int, {iface_position, iface_int}},
 	{"LineFromPosition", 2166, iface_int, {iface_position, iface_void}},
 	{"LineLength", 2350, iface_int, {iface_int, iface_void}},
 	{"LineReverse", 2354, iface_void, {iface_void, iface_void}},
@@ -3040,6 +3078,7 @@
 	{"PositionFromPoint", 2022, iface_position, {iface_int, iface_int}},
 	{"PositionFromPointClose", 2023, iface_position, {iface_int, iface_int}},
 	{"PositionRelative", 2670, iface_position, {iface_position, iface_int}},
+	{"PositionRelativeCodeUnits", 2716, iface_position, {iface_position, iface_int}},
 	{"PrivateLexerCall", 4013, iface_int, {iface_int, iface_int}},
 	{"PropertyNames", 4014, iface_int, {iface_void, iface_stringresult}},
 	{"PropertyType", 4015, iface_int, {iface_string, iface_void}},
@@ -3048,6 +3087,7 @@
 	{"RegisterRGBAImage", 2627, iface_void, {iface_int, iface_string}},
 	{"ReleaseAllExtendedStyles", 2552, iface_void, {iface_void, iface_void}},
 	{"ReleaseDocument", 2377, iface_void, {iface_void, iface_int}},
+	{"ReleaseLineCharacterIndex", 2712, iface_void, {iface_int, iface_void}},
 	{"ReplaceSel", 2170, iface_void, {iface_void, iface_string}},
 	{"ReplaceTarget", 2194, iface_int, {iface_length, iface_string}},
 	{"ReplaceTargetRE", 2195, iface_int, {iface_length, iface_string}},
@@ -3242,6 +3282,7 @@
 	{"Length", 2006, 0, iface_int, iface_void},
 	{"Lexer", 4002, 4001, iface_int, iface_void},
 	{"LexerLanguage", 4012, 4006, iface_stringresult, iface_void},
+	{"LineCharacterIndex", 2710, 0, iface_int, iface_void},
 	{"LineCount", 2154, 0, iface_int, iface_void},
 	{"LineEndPosition", 2136, 0, iface_position, iface_int},
 	{"LineEndTypesActive", 2658, 0, iface_int, iface_void},
@@ -3369,9 +3410,9 @@
 };
 
 enum {
-	ifaceFunctionCount = 301,
-	ifaceConstantCount = 2706,
-	ifacePropertyCount = 229
+	ifaceFunctionCount = 307,
+	ifaceConstantCount = 2740,
+	ifacePropertyCount = 230
 };
 
 //--Autogenerated
diff -Nru scite-4.1.0/scite/src/LuaExtension.cxx scite-4.1.2/scite/src/LuaExtension.cxx
--- scite-4.1.0/scite/src/LuaExtension.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/src/LuaExtension.cxx	2018-09-09 09:00:25.000000000 +0000
@@ -1870,7 +1870,7 @@
 	}
 
 	static int More(lua_State *L) {
-		StylingContext *context = Context(L);
+		const StylingContext *context = Context(L);
 		lua_pushboolean(L, context->currentPos < context->endPos);
 		return 1;
 	}
@@ -1897,25 +1897,25 @@
 	}
 
 	static int Position(lua_State *L) {
-		StylingContext *context = Context(L);
+		const StylingContext *context = Context(L);
 		lua_pushinteger(L, context->currentPos);
 		return 1;
 	}
 
 	static int AtLineStart(lua_State *L) {
-		StylingContext *context = Context(L);
+		const StylingContext *context = Context(L);
 		lua_pushboolean(L, context->atLineStart);
 		return 1;
 	}
 
 	static int AtLineEnd(lua_State *L) {
-		StylingContext *context = Context(L);
+		const StylingContext *context = Context(L);
 		lua_pushboolean(L, context->atLineEnd);
 		return 1;
 	}
 
 	static int State(lua_State *L) {
-		StylingContext *context = Context(L);
+		const StylingContext *context = Context(L);
 		lua_pushinteger(L, context->state);
 		return 1;
 	}
@@ -1942,19 +1942,19 @@
 	}
 
 	static int Current(lua_State *L) {
-		StylingContext *context = Context(L);
+		const StylingContext *context = Context(L);
 		lua_pushstring(L, context->cursor[context->cursorPos % 3]);
 		return 1;
 	}
 
 	static int Next(lua_State *L) {
-		StylingContext *context = Context(L);
+		const StylingContext *context = Context(L);
 		lua_pushstring(L, context->cursor[(context->cursorPos + 1) % 3]);
 		return 1;
 	}
 
 	static int Previous(lua_State *L) {
-		StylingContext *context = Context(L);
+		const StylingContext *context = Context(L);
 		lua_pushstring(L, context->cursor[(context->cursorPos + 2) % 3]);
 		return 1;
 	}
diff -Nru scite-4.1.0/scite/src/pov.properties scite-4.1.2/scite/src/pov.properties
--- scite-4.1.0/scite/src/pov.properties	2017-08-16 07:34:20.000000000 +0000
+++ scite-4.1.2/scite/src/pov.properties	2018-10-02 01:35:45.000000000 +0000
@@ -183,9 +183,14 @@
 # Braces are only matched in operator style
 braces.pov.style=4
 
-command.compile.*.pov=pvengine.exe $(FileName)
-command.build.*.pov=
-command.go.*.pov=pvengine.exe $(FileName)
+if PLAT_WIN
+	command.compile.*.pov=pvengine.exe $(FileName)
+	command.build.*.pov=
+	command.go.*.pov=pvengine.exe $(FileName)
+if PLAT_GTK
+	command.compile.*.pov=povray +P $(FileName).pov
+	command.build.*.pov=
+	command.go.*.pov=povray +P $(FileName).pov
 
 if PLAT_WIN
 	command.help.$(file.patterns.pov)=$(CurrentWord)!D:\Programmes\UImages\POV-Ray 3.5\help\povray35.chm
diff -Nru scite-4.1.0/scite/src/r.properties scite-4.1.2/scite/src/r.properties
--- scite-4.1.0/scite/src/r.properties	2017-08-16 07:34:20.000000000 +0000
+++ scite-4.1.2/scite/src/r.properties	2018-09-09 09:00:25.000000000 +0000
@@ -1,9 +1,9 @@
 # Define SciTE settings for R and S source files
 
-file.patterns.r=*.R;*.rsource;*.S;
+file.patterns.r=*.r;*.R;*.rsource;*.S
 file.patterns.r.like=$(file.patterns.r)
 
-filter.r=R and S+ (R S rsouce)|$(file.patterns.r)|
+filter.r=R and S+ (R S rsource)|$(file.patterns.r)|
 
 *filter.r=$(filter.r)
 
diff -Nru scite-4.1.0/scite/src/SciTEBase.cxx scite-4.1.2/scite/src/SciTEBase.cxx
--- scite-4.1.0/scite/src/SciTEBase.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/src/SciTEBase.cxx	2018-10-02 01:35:45.000000000 +0000
@@ -73,7 +73,7 @@
 
 // The find and replace dialogs and strips often manipulate boolean
 // flags based on dialog control IDs and menu IDs.
-bool &Searcher::FlagFromCmd(int cmd) {
+bool &Searcher::FlagFromCmd(int cmd) noexcept {
 	static bool notFound;
 	switch (cmd) {
 		case IDWHOLEWORD:
@@ -229,7 +229,7 @@
 // The system focus may move to other controls including the menu bar
 // but we are normally interested in whether the edit or output pane was
 // most recently focused and should be used by menu commands.
-void SciTEBase::SetPaneFocus(bool editPane) {
+void SciTEBase::SetPaneFocus(bool editPane) noexcept {
 	pwFocussed = editPane ? &wEditor : &wOutput;
 }
 
@@ -482,7 +482,7 @@
 	return isInside;
 }
 
-static bool IsBrace(char ch) {
+static bool IsBrace(char ch) noexcept {
 	return ch == '[' || ch == ']' || ch == '(' || ch == ')' || ch == '{' || ch == '}';
 }
 
@@ -1718,7 +1718,7 @@
 		return true;
 	const std::string root = line.substr(startword, current - startword);
 	const int doclen = LengthDocument();
-	Sci_TextToFind ft = {{0, 0}, 0, {0, 0}};
+	Sci_TextToFind ft = {{0, 0}, nullptr, {0, 0}};
 	ft.lpstrText = root.c_str();
 	ft.chrg.cpMin = 0;
 	ft.chrg.cpMax = doclen;
@@ -2086,7 +2086,7 @@
 	return true;
 }
 
-static const char *LineEndString(int eolMode) {
+static const char *LineEndString(int eolMode) noexcept {
 	switch (eolMode) {
 		case SC_EOL_CRLF:
 			return "\r\n";
@@ -2182,7 +2182,7 @@
 		// and end-comment tag after the last line (extra logic is necessary to
 		// deal with the case that user selected the end-comment tag)
 		lineStart = wEditor.Call(SCI_POSITIONFROMLINE, selEndLine);
-		GetRangeString(wEditor, lineStart, lineStart + end_comment_length);
+		tempString = GetRangeString(wEditor, lineStart, lineStart + end_comment_length);
 		if (end_comment != tempString) {
 			tempString = GetRangeString(wEditor, lineStart, lineStart + middle_comment_length);
 			if (middle_comment != tempString) {
@@ -2473,7 +2473,7 @@
 	return sv;
 }
 
-inline bool IsAlphabetic(unsigned int ch) {
+inline bool IsAlphabetic(unsigned int ch) noexcept {
 	return ((ch >= 'A') && (ch <= 'Z')) || ((ch >= 'a') && (ch <= 'z'));
 }
 
@@ -2501,7 +2501,7 @@
 	} else {
 		// Set of individual characters. Only one character allowed for now
 		const char ch = symbols.words[0];
-		return strchr(value.c_str(), ch) != 0;
+		return strchr(value.c_str(), ch) != nullptr;
 	}
 	return false;
 }
@@ -2751,8 +2751,8 @@
 		const int selStart = wOutput.Call(SCI_GETSELECTIONSTART);
 		if ((selStart > 1) && (wOutput.Call(SCI_GETCHARAT, selStart - 2, 0) == '$')) {
 			std::string symbols;
-			const char *key = NULL;
-			const char *val = NULL;
+			const char *key = nullptr;
+			const char *val = nullptr;
 			bool b = props.GetFirst(key, val);
 			while (b) {
 				symbols.append(key);
@@ -2945,7 +2945,7 @@
 	jobQueue.AddCommand(cmd, directoryRun, jobType, input, flags);
 }
 
-int ControlIDOfCommand(unsigned long wParam) {
+int ControlIDOfCommand(unsigned long wParam) noexcept {
 	return wParam & 0xffff;
 }
 
@@ -3679,7 +3679,7 @@
 	}
 }
 
-static int LevelNumber(int level) {
+static int LevelNumber(int level) noexcept {
 	return level & SC_FOLDLEVELNUMBERMASK;
 }
 
@@ -4274,7 +4274,7 @@
  * Find the character following a name which is made up of characters from
  * the set [a-zA-Z.]
  */
-static GUI::gui_char AfterName(const GUI::gui_char *s) {
+static GUI::gui_char AfterName(const GUI::gui_char *s) noexcept {
 	while (*s && ((*s == '.') ||
 	        (*s >= 'a' && *s <= 'z') ||
 	        (*s >= 'A' && *s <= 'Z')))
@@ -4322,7 +4322,7 @@
 			GotoLineEnsureVisible(line);
 			// jump to column if given and greater than 0
 			const char *colstr = strchr(arg, ',');
-			if (colstr != NULL) {
+			if (colstr) {
 				const int col = atoi(colstr + 1);
 				if (col > 0) {
 					const int pos = wEditor.Call(SCI_GETCURRENTPOS) + col;
@@ -4383,7 +4383,7 @@
 	}
 }
 
-static bool IsSwitchCharacter(GUI::gui_char ch) {
+static bool IsSwitchCharacter(GUI::gui_char ch) noexcept {
 #ifdef __unix__
 	return ch == '-';
 #else
@@ -4393,7 +4393,7 @@
 
 // Called by SciTEBase::PerformOne when action="enumproperties:"
 void SciTEBase::EnumProperties(const char *propkind) {
-	PropSetFile *pf = NULL;
+	PropSetFile *pf = nullptr;
 
 	if (!extender)
 		return;
@@ -4415,9 +4415,9 @@
 	else if (!strcmp(propkind, "abbrev"))
 		pf = &propsAbbrev;
 
-	if (pf != NULL) {
-		const char *key = NULL;
-		const char *val = NULL;
+	if (pf) {
+		const char *key = nullptr;
+		const char *val = nullptr;
 		bool b = pf->GetFirst(key, val);
 		while (b) {
 			SendOneProperty(propkind, key, val);
@@ -4466,7 +4466,7 @@
 		sMessage += StdStringFromSizeT(static_cast<size_t>(notification->wParam));
 		sMessage += ";";
 		const char *t = reinterpret_cast<const char *>(notification->lParam);
-		if (t != NULL) {
+		if (t) {
 			//format : "<message>;<wParam>;1;<text>"
 			sMessage += "1;";
 			sMessage += t;
@@ -4661,7 +4661,7 @@
 				}
 			} else if ((tolower(arg[0]) == 'p') && (arg[1] == 0)) {
 				performPrint = true;
-			} else if (GUI::gui_string(arg) == GUI_TEXT("grep") && (wlArgs.size() - i >= 4)) {
+			} else if (GUI::gui_string(arg) == GUI_TEXT("grep") && (wlArgs.size() - i >= 4) && (wlArgs[i+1].size() >= 4)) {
 				// in form -grep [w~][c~][d~][b~] "<file-patterns>" "<search-string>"
 				GrepFlags gf = grepStdOut;
 				if (wlArgs[i+1][0] == 'w')
@@ -4694,7 +4694,7 @@
 				} else {
 					if (evaluate) {
 						props.ReadLine(GUI::UTF8FromString(arg).c_str(), PropSetFile::rlActive,
-							FilePath::GetWorkingDirectory(), filter, NULL, 0);
+							FilePath::GetWorkingDirectory(), filter, nullptr, 0);
 					}
 				}
 			}
@@ -4797,7 +4797,7 @@
 	std::vector<char> vActions(actionList, actionList + strlen(actionList) + 1);
 	char *actions = &vActions[0];
 	char *nextAct;
-	while ((nextAct = strchr(actions, '\n')) != NULL) {
+	while ((nextAct = strchr(actions, '\n')) != nullptr) {
 		*nextAct = '\0';
 		PerformOne(actions);
 		actions = nextAct + 1;
diff -Nru scite-4.1.0/scite/src/SciTEBase.h scite-4.1.2/scite/src/SciTEBase.h
--- scite-4.1.0/scite/src/SciTEBase.h	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/src/SciTEBase.h	2018-10-02 01:35:45.000000000 +0000
@@ -19,15 +19,15 @@
 #endif
 #endif
 
-inline int Minimum(int a, int b) {
+inline int Minimum(int a, int b) noexcept {
 	return (a < b) ? a : b;
 }
 
-inline int Maximum(int a, int b) {
+inline int Maximum(int a, int b) noexcept {
 	return (a > b) ? a : b;
 }
 
-inline long LongFromTwoShorts(short a,short b) {
+inline long LongFromTwoShorts(short a,short b) noexcept {
 	return (a) | ((b) << 16);
 }
 
@@ -44,7 +44,7 @@
 struct SelectedRange {
 	int position;
 	int anchor;
-	SelectedRange(int position_= INVALID_POSITION, int anchor_= INVALID_POSITION) :
+	SelectedRange(int position_= INVALID_POSITION, int anchor_= INVALID_POSITION) noexcept :
 		position(position_), anchor(anchor_) {
 	}
 };
@@ -110,7 +110,7 @@
 	Buffer() :
 			file(), doc(0), isDirty(false), isReadOnly(false), failedSave(false), useMonoFont(false), lifeState(empty),
 			unicodeMode(uni8Bit), fileModTime(0), fileModLastAsk(0), documentModTime(0),
-			findMarks(fmNone), pFileWorker(0), futureDo(fdNone) {}
+			findMarks(fmNone), pFileWorker(nullptr), futureDo(fdNone) {}
 
 	~Buffer() = default;
 	void Init() {
@@ -128,7 +128,7 @@
 		overrideExtension = "";
 		foldState.clear();
 		bookmarks.clear();
-		pFileWorker = 0;
+		pFileWorker = nullptr;
 		futureDo = fdNone;
 	}
 
@@ -146,7 +146,7 @@
 	void CompleteStoring();
 	void AbandonAutomaticSave();
 
-	bool ShouldNotSave() const {
+	bool ShouldNotSave() const noexcept {
 		return lifeState != open;
 	}
 
@@ -174,7 +174,7 @@
 
 	BufferList();
 	~BufferList();
-	int size() const {
+	int size() const noexcept {
 		return static_cast<int>(buffers.size());
 	}
 	void Allocate(int maxSize);
@@ -183,10 +183,10 @@
 	int GetDocumentByName(const FilePath &filename, bool excludeCurrent=false);
 	void RemoveInvisible(int index);
 	void RemoveCurrent();
-	int Current() const;
+	int Current() const noexcept;
 	Buffer *CurrentBuffer();
 	const Buffer *CurrentBufferConst() const;
-	void SetCurrent(int index);
+	void SetCurrent(int index) noexcept;
 	int StackNext();
 	int StackPrev();
 	void CommitStackSelection();
@@ -196,7 +196,7 @@
 	bool SingleBuffer() const;
 	BackgroundActivities CountBackgroundActivities() const;
 	bool SavingInBackground() const;
-	bool GetVisible(int index) const;
+	bool GetVisible(int index) const noexcept;
 	void SetVisible(int index, bool visible);
 	void AddFuture(int index, Buffer::FutureDo fd);
 	void FinishedFuture(int index, Buffer::FutureDo fd);
@@ -247,10 +247,10 @@
 struct StyleAndWords {
 	int styleNumber;
 	std::string words;
-	StyleAndWords() : styleNumber(0) {
+	StyleAndWords() noexcept : styleNumber(0) {
 	}
-	bool IsEmpty() const { return words.length() == 0; }
-	bool IsSingleChar() const { return words.length() == 1; }
+	bool IsEmpty() const noexcept { return words.length() == 0; }
+	bool IsSingleChar() const noexcept { return words.length() == 1; }
 };
 
 struct CurrentWordHighlight {
@@ -268,8 +268,8 @@
 	CurrentWordHighlight() {
 		statesOfDelay = noDelay;
 		isEnabled = false;
-		isOnlyWithSameStyle = false;
 		textHasChanged = false;
+		isOnlyWithSameStyle = false;
 	}
 };
 
@@ -329,8 +329,8 @@
 	virtual void ReplaceOnce(bool showWarnings=true) = 0;
 	virtual void UIClosed() = 0;
 	virtual void UIHasFocus() = 0;
-	bool &FlagFromCmd(int cmd);
-	bool ShouldClose(bool found) const {
+	bool &FlagFromCmd(int cmd) noexcept;
+	bool ShouldClose(bool found) const noexcept {
 		return (closeFind == CloseFind::closeAlways) || (found && (closeFind == CloseFind::closeOnMatch));
 	}
 };
@@ -347,9 +347,9 @@
 protected:
 	Searcher *pSearcher;
 public:
-	SearchUI() : pSearcher(0) {
+	SearchUI() noexcept : pSearcher(nullptr) {
 	}
-	void SetSearcher(Searcher *pSearcher_) {
+	void SetSearcher(Searcher *pSearcher_) noexcept {
 		pSearcher = pSearcher_;
 	}
 };
@@ -580,7 +580,7 @@
 	void ReadLocalPropFile();
 	void ReadDirectoryPropFile();
 
-	void SetPaneFocus(bool editPane);
+	void SetPaneFocus(bool editPane) noexcept;
 	int CallFocused(unsigned int msg, uptr_t wParam = 0, sptr_t lParam = 0);
 	int CallFocusedElseDefault(int defaultValue, unsigned int msg, uptr_t wParam = 0, sptr_t lParam = 0);
 	sptr_t CallPane(int destination, unsigned int msg, uptr_t wParam = 0, sptr_t lParam = 0);
@@ -734,7 +734,7 @@
 	};
 	virtual MessageBoxChoice WindowMessageBox(GUI::Window &w, const GUI::gui_string &msg, MessageBoxStyle style = mbsIconWarning) = 0;
 	void FailedSaveMessageBox(const FilePath &filePathSaving);
-	virtual void FindMessageBox(const std::string &msg, const std::string *findItem = 0) = 0;
+	virtual void FindMessageBox(const std::string &msg, const std::string *findItem = nullptr) = 0;
 	bool FindReplaceAdvanced() const;
 	int FindInTarget(const std::string &findWhatText, int startPosition, int endPosition);
 	// Implement Searcher
@@ -853,7 +853,7 @@
 	virtual void SizeSubWindows() = 0;
 
 	virtual void SetMenuItem(int menuNumber, int position, int itemID,
-		const GUI::gui_char *text, const GUI::gui_char *mnemonic = 0) = 0;
+		const GUI::gui_char *text, const GUI::gui_char *mnemonic = nullptr) = 0;
 	virtual void RedrawMenu() {}
 	virtual void DestroyMenuItem(int menuNumber, int itemID) = 0;
 	virtual void CheckAMenuItem(int wIDCheckItem, bool val) = 0;
@@ -890,7 +890,7 @@
 	void SetLanguageMenu();
 	void SetPropertiesInitial();
 	GUI::gui_string LocaliseMessage(const char *s,
-		const GUI::gui_char *param0 = 0, const GUI::gui_char *param1 = 0, const GUI::gui_char *param2 = 0);
+		const GUI::gui_char *param0 = nullptr, const GUI::gui_char *param1 = nullptr, const GUI::gui_char *param2 = nullptr);
 	virtual void ReadLocalization();
 	std::string GetFileNameProperty(const char *name);
 	virtual void ReadPropertiesInitial();
@@ -989,7 +989,7 @@
 
 	void Finalise();
 
-	GUI::WindowID GetID() const { return wSciTE.GetID(); }
+	GUI::WindowID GetID() const noexcept { return wSciTE.GetID(); }
 
 	virtual bool PerformOnNewThread(Worker *pWorker) = 0;
 	// WorkerListener
@@ -997,10 +997,10 @@
 	virtual void WorkerCommand(int cmd, Worker *pWorker);
 };
 
-int ControlIDOfCommand(unsigned long);
+int ControlIDOfCommand(unsigned long) noexcept;
 long ColourOfProperty(const PropSetFile &props, const char *key, Colour colourDefault);
 void WindowSetFocus(GUI::ScintillaWindow &w);
 
-inline bool isspacechar(unsigned char ch) {
+inline bool isspacechar(unsigned char ch) noexcept {
     return (ch == ' ') || ((ch >= 0x09) && (ch <= 0x0d));
 }
diff -Nru scite-4.1.0/scite/src/SciTEBuffers.cxx scite-4.1.2/scite/src/SciTEBuffers.cxx
--- scite-4.1.0/scite/src/SciTEBuffers.cxx	2018-04-20 03:39:46.000000000 +0000
+++ scite-4.1.2/scite/src/SciTEBuffers.cxx	2018-10-02 01:35:45.000000000 +0000
@@ -46,11 +46,11 @@
 const GUI::gui_char defaultSessionFileName[] = GUI_TEXT("SciTE.session");
 
 void Buffer::DocumentModified() {
-	documentModTime = time(0);
+	documentModTime = time(nullptr);
 }
 
 bool Buffer::NeedsSave(int delayBeforeSave) const {
-	const time_t now = time(0);
+	const time_t now = time(nullptr);
 	return now && documentModTime && isDirty && !pFileWorker && (now-documentModTime > delayBeforeSave) && !file.IsUntitled() && !failedSave;
 }
 
@@ -58,14 +58,14 @@
 	lifeState = open;
 	if (pFileWorker && pFileWorker->IsLoading()) {
 		delete pFileWorker;
-		pFileWorker = 0;
+		pFileWorker = nullptr;
 	}
 }
 
 void Buffer::CompleteStoring() {
 	if (pFileWorker && !pFileWorker->IsLoading()) {
 		delete pFileWorker;
-		pFileWorker = 0;
+		pFileWorker = nullptr;
 	}
 	SetTimeFromFile();
 }
@@ -178,7 +178,7 @@
 	MoveToStackTop(current);
 }
 
-int BufferList::Current() const {
+int BufferList::Current() const noexcept {
 	return current;
 }
 
@@ -190,7 +190,7 @@
 	return &buffers[Current()];
 }
 
-void BufferList::SetCurrent(int index) {
+void BufferList::SetCurrent(int index) noexcept {
 	current = index;
 }
 
@@ -317,7 +317,7 @@
 	return false;
 }
 
-bool BufferList::GetVisible(int index) const {
+bool BufferList::GetVisible(int index) const noexcept {
 	return index < lengthVisible;
 }
 
@@ -541,7 +541,7 @@
 	std::string pKey = bufPrefix;
 	pKey += '.';
 	pKey += StdStringFromInteger(bufIndex + 1);
-	if (bufAppendix != NULL) {
+	if (bufAppendix) {
 		pKey += ".";
 		pKey += bufAppendix;
 	}
@@ -557,7 +557,7 @@
 	}
 
 	propsSession.Clear();
-	propsSession.Read(sessionPathName, sessionPathName.Directory(), filter, NULL, 0);
+	propsSession.Read(sessionPathName, sessionPathName.Directory(), filter, nullptr, 0);
 
 	FilePath sessionFilePath = FilePath(sessionPathName).AbsolutePath();
 	// Add/update SessionPath environment variable
@@ -1441,7 +1441,7 @@
 				sMnemonic += StdStringFromInteger(item);
 			}
 			SetMenuItemLocalised(menuTools, menuPos, itemID, sMenuItem.c_str(),
-				sMnemonic.length() ? sMnemonic.c_str() : NULL);
+				sMnemonic.length() ? sMnemonic.c_str() : nullptr);
 			menuPos++;
 		}
 	}
@@ -1497,7 +1497,7 @@
 	}
 }
 
-inline bool isdigitchar(int ch) {
+inline bool isdigitchar(int ch) noexcept {
 	return (ch >= '0') && (ch <= '9');
 }
 
@@ -1586,7 +1586,7 @@
 					space++;
 				}
 
-				const char *space2 = NULL;
+				const char *space2 = nullptr;
 
 				if (strlen(space) > 2) {
 					space2 = strchr(space + 2, ':');
@@ -1615,11 +1615,13 @@
 			// perl
 			const char *at = strstr(cdoc, " at ");
 			const char *line = strstr(cdoc, " line ");
-			const ptrdiff_t length = line - (at + 4);
-			if (at && line && length > 0) {
-				sourcePath.assign(at + 4, length);
-				line += 6;
-				return atoi(line) - 1;
+			if (at && line) {
+				const ptrdiff_t length = line - (at + 4);
+				if (length > 0) {
+					sourcePath.assign(at + 4, length);
+					line += 6;
+					return atoi(line) - 1;
+				}
 			}
 			break;
 		}
@@ -1646,9 +1648,11 @@
 			if (line && file) {
 				const char *fileStart = file + lenFile + 1;
 				const char *quote = strstr(fileStart, "'");
-				const size_t length = quote - fileStart;
-				if (quote && length > 0) {
-					sourcePath.assign(fileStart, length);
+				if (quote) {
+					const size_t length = quote - fileStart;
+					if (length > 0) {
+						sourcePath.assign(fileStart, length);
+					}
 				}
 				line += lenLine;
 				return atoi(line) - 1;
@@ -1846,7 +1850,7 @@
 
 #define CSI "\033["
 
-static bool SeqEnd(int ch) {
+static bool SeqEnd(int ch) noexcept {
 	return (ch == 0) || ((ch >= '@') && (ch <= '~'));
 }
 
@@ -1906,7 +1910,7 @@
 					}
 				}
 			}
-			const int lenCurrent = wEditor.CallString(SCI_ANNOTATIONGETTEXT, sourceLine, NULL);
+			const int lenCurrent = wEditor.CallString(SCI_ANNOTATIONGETTEXT, sourceLine, nullptr);
 			std::string msgCurrent(lenCurrent, '\0');
 			std::string stylesCurrent(lenCurrent, '\0');
 			if (lenCurrent) {
@@ -1985,7 +1989,7 @@
 						bExists = true;
 					} else if (Exists(filePath.Directory().AsInternal(), sourceString.c_str(), &messagePath)) {
 						bExists = true;
-					} else if (Exists(NULL, sourceString.c_str(), &messagePath)) {
+					} else if (Exists(nullptr, sourceString.c_str(), &messagePath)) {
 						bExists = true;
 					} else {
 						// Look through buffers for name match
diff -Nru scite-4.1.0/scite/src/SciTEGlobal.properties scite-4.1.2/scite/src/SciTEGlobal.properties
--- scite-4.1.0/scite/src/SciTEGlobal.properties	2018-05-06 22:32:10.000000000 +0000
+++ scite-4.1.2/scite/src/SciTEGlobal.properties	2018-09-09 09:00:25.000000000 +0000
@@ -506,7 +506,7 @@
 # To keep menus short, these .properties files are not loaded by default.
 imports.exclude=abaqus asl asn1 au3 ave avs baan blitzbasic bullant \
 cmake cobol coffeescript csound ecl eiffel erlang escript flagship forth freebasic \
-gap haskell hex inno json kix latex lot lout \
+gap haskell hex inno kix latex lot lout \
 markdown maxima metapost mmixal modula3 nimrod nncrontab nsis \
 opal oscript pov powerpro powershell ps purebasic r rebol rust \
 scriptol smalltalk sorcins spice specman \
diff -Nru scite-4.1.0/scite/src/SciTE.h scite-4.1.2/scite/src/SciTE.h
--- scite-4.1.0/scite/src/SciTE.h	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/src/SciTE.h	2018-10-02 01:35:45.000000000 +0000
@@ -9,9 +9,9 @@
 #define SCITE_H
 
 // Version numbers and dates
-#define VERSION_SCITE "4.1.0"
-#define VERSION_WORDS 4, 1, 0, 0
-#define COPYRIGHT_DATES "December 1998-June 2018"
+#define VERSION_SCITE "4.1.2"
+#define VERSION_WORDS 4, 1, 2, 0
+#define COPYRIGHT_DATES "December 1998-October 2018"
 #define COPYRIGHT_YEARS "1998-2018"
 
 // Menu IDs.
diff -Nru scite-4.1.0/scite/src/SciTEIO.cxx scite-4.1.2/scite/src/SciTEIO.cxx
--- scite-4.1.0/scite/src/SciTEIO.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/src/SciTEIO.cxx	2018-10-02 01:35:45.000000000 +0000
@@ -275,7 +275,7 @@
 		// Turn grey while loading
 		wEditor.Call(SCI_STYLESETBACK, STYLE_DEFAULT, 0xEEEEEE);
 		wEditor.Call(SCI_SETREADONLY, 1);
-		assert(CurrentBufferConst()->pFileWorker == NULL);
+		assert(CurrentBufferConst()->pFileWorker == nullptr);
 		ILoader *pdocLoad;
 		try {
 			sptr_t docOptions = SC_DOCUMENTOPTION_DEFAULT;
@@ -312,7 +312,7 @@
 			lenFile = fread(&data[0], 1, data.size(), fp);
 			if (lenFile == 0) {
 				// Handle case where convert is holding a lead surrogate but no more data
-				const size_t lenFileTrail = convert.convert(NULL, lenFile);
+				const size_t lenFileTrail = convert.convert(nullptr, lenFile);
 				if (lenFileTrail) {
 					const char *dataTrail = convert.getNewBuf();
 					wEditor.CallString(SCI_ADDTEXT, lenFileTrail, dataTrail);
@@ -348,7 +348,7 @@
 		}
 		// Switch documents
 		const sptr_t pdocLoading = reinterpret_cast<sptr_t>(pFileLoader->pLoader->ConvertToDocument());
-		pFileLoader->pLoader = 0;
+		pFileLoader->pLoader = nullptr;
 		SwitchDocumentAt(iBuffer, pdocLoading);
 		if (iBuffer == buffers.Current()) {
 			CompleteOpen(ocCompleteCurrent);
@@ -573,7 +573,7 @@
 		}
 	}
 
-	assert(CurrentBufferConst()->pFileWorker == NULL);
+	assert(CurrentBufferConst()->pFileWorker == nullptr);
 	SetFileName(absPath);
 
 	propsDiscovered.Clear();
@@ -582,7 +582,7 @@
 		std::string propertiesText = CommandExecute(GUI::StringFromUTF8(discoveryScript).c_str(),
 			absPath.Directory().AsInternal());
 		if (propertiesText.size()) {
-			propsDiscovered.ReadFromMemory(propertiesText.c_str(), propertiesText.size(), absPath.Directory(), filter, NULL, 0);
+			propsDiscovered.ReadFromMemory(propertiesText.c_str(), propertiesText.size(), absPath.Directory(), filter, nullptr, 0);
 		}
 	}
 	CurrentBuffer()->props = propsDiscovered;
@@ -706,7 +706,7 @@
 	if (!FilePath(selFN).IsAbsolute()) {
 		path = filePath.Directory();
 		// If not there, look in openpath
-		if (!Exists(path.AsInternal(), selFN.c_str(), NULL)) {
+		if (!Exists(path.AsInternal(), selFN.c_str(), nullptr)) {
 			GUI::gui_string openPath = GUI::StringFromUTF8(props.GetNewExpandString(
 			            "openpath.", fileNameForExtension.c_str()));
 			while (openPath.length()) {
@@ -718,7 +718,7 @@
 				} else {
 					openPath.erase();
 				}
-				if (Exists(tryPath.c_str(), selFN.c_str(), NULL)) {
+				if (Exists(tryPath.c_str(), selFN.c_str(), nullptr)) {
 					path.Set(tryPath.c_str());
 					break;
 				}
@@ -1208,7 +1208,7 @@
 		return true;
 	} else {
 		if (props.GetString("save.path.suggestion").length()) {
-			const time_t t = time(NULL);
+			const time_t t = time(nullptr);
 			char timeBuff[15];
 			strftime(timeBuff, sizeof(timeBuff), "%Y%m%d%H%M%S",  localtime(&t));
 			PropSetFile propsSuggestion;
@@ -1338,7 +1338,7 @@
 
 	while (fgets(data, sizeof(data) - 1, stdin)) {
 		char *pNL;
-		if ((pNL = strchr(data, '\n')) != NULL)
+		if ((pNL = strchr(data, '\n')) != nullptr)
 			* pNL = '\0';
 		Open(GUI::StringFromUTF8(data).c_str(), ofQuiet);
 	}
@@ -1371,7 +1371,7 @@
 	explicit BufferedFile(const FilePath &fPath) {
 		fp = fPath.Open(fileRead);
 		readAll = false;
-		exhausted = fp == NULL;
+		exhausted = fp == nullptr;
 		buffer[0] = 0;
 		pos = 0;
 		valid = 0;
@@ -1380,9 +1380,9 @@
 		if (fp) {
 			fclose(fp);
 		}
-		fp = NULL;
+		fp = nullptr;
 	}
-	bool Exhausted() const {
+	bool Exhausted() const noexcept {
 		return exhausted;
 	}
 	int NextByte() {
@@ -1421,7 +1421,7 @@
 	}
 	const char *Next() {
 		if (bf->Exhausted()) {
-			return NULL;
+			return nullptr;
 		}
 		lineToShow.clear();
 		while (!bf->Exhausted()) {
@@ -1442,10 +1442,10 @@
 		}
 		return lineToCompare.c_str();
 	}
-	int LineNumber() const {
+	int LineNumber() const noexcept {
 		return lineNum;
 	}
-	const char *Original() const {
+	const char *Original() const noexcept {
 		return lineToShow.c_str();
 	}
 	bool BufferContainsNull() {
@@ -1453,7 +1453,7 @@
 	}
 };
 
-static bool IsWordCharacter(int ch) {
+static bool IsWordCharacter(int ch) noexcept {
 	return (ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z')  || (ch >= '0' && ch <= '9')  || (ch == '_');
 }
 
diff -Nru scite-4.1.0/scite/src/SciTEKeys.h scite-4.1.2/scite/src/SciTEKeys.h
--- scite-4.1.0/scite/src/SciTEKeys.h	2017-08-16 07:34:20.000000000 +0000
+++ scite-4.1.2/scite/src/SciTEKeys.h	2018-09-09 09:00:25.000000000 +0000
@@ -11,7 +11,7 @@
 class SciTEKeys {
 public:
 	static long ParseKeyCode(const char *mnemonic);
-	static bool MatchKeyCode(long parsedKeyCode, int keyval, int modifiers);
+	static bool MatchKeyCode(long parsedKeyCode, int keyval, int modifiers) noexcept;
 };
 
 #endif
diff -Nru scite-4.1.0/scite/src/SciTEProps.cxx scite-4.1.2/scite/src/SciTEProps.cxx
--- scite-4.1.0/scite/src/SciTEProps.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/src/SciTEProps.cxx	2018-10-02 01:35:45.000000000 +0000
@@ -186,7 +186,7 @@
 		FilePath propfile = GetDirectoryPropertiesFileName();
 		props.Set("SciteDirectoryHome", propfile.Directory().AsUTF8().c_str());
 
-		propsDirectory.Read(propfile, propfile.Directory(), filter, NULL, 0);
+		propsDirectory.Read(propfile, propfile.Directory(), filter, nullptr, 0);
 	}
 }
 
@@ -201,7 +201,7 @@
 	FilePath propfile = GetLocalPropertiesFileName();
 
 	propsLocal.Clear();
-	propsLocal.Read(propfile, propfile.Directory(), filter, NULL, 0);
+	propsLocal.Read(propfile, propfile.Directory(), filter, nullptr, 0);
 
 	props.Set("Chrome", "#C0C0C0");
 	props.Set("ChromeHighlight", "#FFFFFF");
@@ -235,8 +235,8 @@
 	ptrdiff_t size = maxLen - 1;
 
 	*pPropItem = '\0';
-	if (pStart == NULL) {
-		return NULL;
+	if (!pStart) {
+		return nullptr;
 	}
 	const char *pNext = strchr(pStart, ',');
 	if (pNext) {	// Separator is found
@@ -696,7 +696,7 @@
 	}
 
 	subStyleBases.clear();
-	const int lenSSB = wEditor.CallString(SCI_GETSUBSTYLEBASES, 0, NULL);
+	const int lenSSB = wEditor.CallString(SCI_GETSUBSTYLEBASES, 0, nullptr);
 	if (lenSSB) {
 		wEditor.Call(SCI_FREESUBSTYLES);
 
diff -Nru scite-4.1.0/scite/src/StringList.cxx scite-4.1.2/scite/src/StringList.cxx
--- scite-4.1.0/scite/src/StringList.cxx	2018-04-20 03:39:46.000000000 +0000
+++ scite-4.1.2/scite/src/StringList.cxx	2018-09-09 09:00:25.000000000 +0000
@@ -196,7 +196,7 @@
  * counted in the length.
  */
 static size_t LengthWord(const char *word, char otherSeparator) {
-	const char *endWord = 0;
+	const char *endWord = nullptr;
 	// Find an otherSeparator
 	if (otherSeparator)
 		endWord = strchr(word, otherSeparator);
diff -Nru scite-4.1.0/scite/src/Utf8_16.cxx scite-4.1.2/scite/src/Utf8_16.cxx
--- scite-4.1.0/scite/src/Utf8_16.cxx	2018-04-20 03:39:46.000000000 +0000
+++ scite-4.1.2/scite/src/Utf8_16.cxx	2018-10-02 01:35:45.000000000 +0000
@@ -32,8 +32,8 @@
 Utf8_16_Read::Utf8_16_Read() {
 	m_eEncoding = eUnknown;
 	m_nBufSize = 0;
-	m_pBuf = NULL;
-	m_pNewBuf = NULL;
+	m_pBuf = nullptr;
+	m_pNewBuf = nullptr;
 	m_bFirstRead = true;
 	m_nLen = 0;
 	m_leadSurrogate[0] = 0;
@@ -43,7 +43,7 @@
 Utf8_16_Read::~Utf8_16_Read() {
 	if ((m_eEncoding != eUnknown) && (m_eEncoding != eUtf8)) {
 		delete [] m_pNewBuf;
-		m_pNewBuf = NULL;
+		m_pNewBuf = nullptr;
 	}
 }
 
@@ -82,7 +82,7 @@
 	ubyte* pCur = m_pNewBuf;
 
 	ubyte endSurrogate[2] = { 0, 0 };
-	ubyte *pbufPrependSurrogate = NULL;
+	ubyte *pbufPrependSurrogate = nullptr;
 	if (m_leadSurrogate[0]) {
 		pbufPrependSurrogate = new ubyte[len - nSkip + 2];
 		memcpy(pbufPrependSurrogate, m_leadSurrogate, 2);
@@ -133,8 +133,8 @@
 
 Utf8_16_Write::Utf8_16_Write() {
 	m_eEncoding = eUnknown;
-	m_pFile = NULL;
-	m_pBuf = NULL;
+	m_pFile = nullptr;
+	m_pBuf = nullptr;
 	m_bFirstWrite = true;
 	m_nBufSize = 0;
 }
@@ -220,10 +220,10 @@
 
 int Utf8_16_Write::fclose() {
 	delete [] m_pBuf;
-	m_pBuf = NULL;
+	m_pBuf = nullptr;
 
 	const int ret = ::fclose(m_pFile);
-	m_pFile = NULL;
+	m_pFile = nullptr;
 
 	return ret;
 }
@@ -238,9 +238,9 @@
 }
 
 void Utf8_Iter::reset() {
-	m_pBuf = NULL;
-	m_pRead = NULL;
-	m_pEnd = NULL;
+	m_pBuf = nullptr;
+	m_pRead = nullptr;
+	m_pEnd = nullptr;
 	m_eState = eStart;
 	m_nCur = 0;
 	m_eEncoding = eUnknown;
@@ -299,9 +299,9 @@
 }
 
 void Utf16_Iter::reset() {
-	m_pBuf = NULL;
-	m_pRead = NULL;
-	m_pEnd = NULL;
+	m_pBuf = nullptr;
+	m_pRead = nullptr;
+	m_pEnd = nullptr;
 	m_eState = eStart;
 	m_nCur = 0;
 	m_nCur16 = 0;
diff -Nru scite-4.1.0/scite/win32/DirectorExtension.cxx scite-4.1.2/scite/win32/DirectorExtension.cxx
--- scite-4.1.0/scite/win32/DirectorExtension.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/win32/DirectorExtension.cxx	2018-09-09 09:00:25.000000000 +0000
@@ -51,7 +51,7 @@
 	return (wDirector != 0) || (wCorrespondent != 0);
 }
 
-static void SendDirector(const char *verb, const char *arg = 0) {
+static void SendDirector(const char *verb, const char *arg = nullptr) {
 	if (HasConnection()) {
 		HWND wDestination = wCorrespondent;
 		std::string addressedMessage;
@@ -72,8 +72,7 @@
 		cds.dwData = 0;
 		cds.cbData = static_cast<int>(slashedMessage.length());
 		slashedMessage.append(1, '\0');	// Ensure NUL at end of string
-		cds.lpData = static_cast<void *>(
-			                &slashedMessage[0]);
+		cds.lpData = &slashedMessage[0];
 		::SendMessage(wDestination, WM_COPYDATA,
 			            reinterpret_cast<WPARAM>(wReceiver),
 			            reinterpret_cast<LPARAM>(&cds));
@@ -137,7 +136,7 @@
 	wndclass.hIcon = 0;
 	wndclass.hCursor = NULL;
 	wndclass.hbrBackground = NULL;
-	wndclass.lpszMenuName = 0;
+	wndclass.lpszMenuName = nullptr;
 	wndclass.lpszClassName = DirectorExtension_ClassName;
 	if (!::RegisterClass(&wndclass))
 		::exit(FALSE);
diff -Nru scite-4.1.0/scite/win32/locale.properties scite-4.1.2/scite/win32/locale.properties
--- scite-4.1.0/scite/win32/locale.properties	2017-08-16 07:34:20.000000000 +0000
+++ scite-4.1.2/scite/win32/locale.properties	2018-09-09 09:00:25.000000000 +0000
@@ -21,10 +21,12 @@
 
 # Define the encoding of this file so that on GTK+ 2, the file can be
 # reencoded as UTF-8 as that is the GTK+ 2 user interface encoding.
-# A common choice for European users is LATIN1. For other locales look at
-# the set of encodings supported by iconv.
+# It's recommended that translations use UTF-8 with no BOM.
 translation.encoding=
 
+# This is to add something like: Swahili translation 1.41.1 by Neil Hodgson
+TranslationCredit=
+
 # Menus
 
 # File menu
@@ -147,8 +149,6 @@
 
 # About dialog
 #About SciTE=
-# This is to add something like: Swahili translation 1.41.1 by Neil Hodgson
-TranslationCredit=
 Contributors:=
 
 # Open, Save dialogs
@@ -386,7 +386,7 @@
 
 # Mac OS X 3.3.5
 Spelling=
-No guesses for '^0'
+No guesses for '^0'=
 
 # 3.3.8
 Path '^0' is a directory so can not be opened.=
diff -Nru scite-4.1.0/scite/win32/makefile scite-4.1.2/scite/win32/makefile
--- scite-4.1.0/scite/win32/makefile	2018-05-06 22:32:10.000000000 +0000
+++ scite-4.1.2/scite/win32/makefile	2018-09-09 09:00:25.000000000 +0000
@@ -79,7 +79,7 @@
 INCLUDEDIRS=-I ../../scintilla/include -I ../src $(LUA_INCLUDES)
 RCINCLUDEDIRS=--include-dir ../src
 
-CBASEFLAGS = -W -Wall $(INCLUDEDIRS) $(LUA_DEFINES) $(WIDEFLAGS) $(VERSION_DEFINES) $(CLANG_OPTS)
+CBASEFLAGS = -Wall $(INCLUDEDIRS) $(LUA_DEFINES) $(WIDEFLAGS) $(VERSION_DEFINES) $(CLANG_OPTS)
 
 ifdef DEBUG
 CFLAGS=-DDEBUG -g $(CBASEFLAGS)
diff -Nru scite-4.1.0/scite/win32/SciTE.vcxproj scite-4.1.2/scite/win32/SciTE.vcxproj
--- scite-4.1.0/scite/win32/SciTE.vcxproj	2018-04-10 01:38:45.000000000 +0000
+++ scite-4.1.2/scite/win32/SciTE.vcxproj	2018-09-09 09:00:25.000000000 +0000
@@ -63,7 +63,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STATIC_BUILD;SCI_LEXER;LINK_LEXERS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;LUA_USER_H="scite_lua_win.h";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;STATIC_BUILD;SCI_LEXER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;LUA_USER_H="scite_lua_win.h";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\src;..\lua\src;..\..\scintilla\include;..\..\scintilla\src;..\..\scintilla\lexlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
diff -Nru scite-4.1.0/scite/win32/SciTEWinBar.cxx scite-4.1.2/scite/win32/SciTEWinBar.cxx
--- scite-4.1.0/scite/win32/SciTEWinBar.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/win32/SciTEWinBar.cxx	2018-10-02 01:35:45.000000000 +0000
@@ -370,7 +370,6 @@
 	const GUI::Rectangle rcClient = wSciTE.GetClientPosition();
 	bool showTab = false;
 
-	//::SendMessage(MainHWND(), WM_SETREDRAW, false, 0); // suppress flashing
 	visHeightTools = tbVisible ? (tbLarge ? heightToolsBig : heightTools) : 0;
 	bands[bandTool].visible = tbVisible;
 
@@ -449,8 +448,6 @@
 	visHeightStatus = bands[bandStatus].height;
 
 	SizeContentWindows();
-	//::SendMessage(MainHWND(), WM_SETREDRAW, true, 0);
-	//::RedrawWindow(MainHWND(), NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN);
 }
 
 
@@ -598,10 +595,10 @@
 
 void SciTEWin::LocaliseDialog(HWND wDialog) {
 	LocaliseControl(wDialog);
-	HWND wChild = ::GetWindow(wDialog, GW_CHILD);
+	HWND wChild = GetFirstChild(wDialog);
 	while (wChild) {
 		LocaliseControl(wChild);
-		wChild = ::GetWindow(wChild, GW_HWNDNEXT);
+		wChild = GetNextSibling(wChild);
 	}
 }
 
@@ -781,15 +778,15 @@
 						};
 
 						HPEN pen = ::CreatePen(0,1,RGB(255, 0, 0));
-						HPEN penOld = static_cast<HPEN>(::SelectObject(hDC, pen));
+						HPEN penOld = SelectPen(hDC, pen);
 						const COLORREF colourNearest = ::GetNearestColor(hDC, RGB(255, 0, 0));
 						HBRUSH brush = ::CreateSolidBrush(colourNearest);
-						HBRUSH brushOld = static_cast<HBRUSH>(::SelectObject(hDC, brush));
+						HBRUSH brushOld = SelectBrush(hDC, brush);
 						::Polygon(hDC, tab < st_iDraggingTab ? ptsLeftArrow : ptsRightArrow, 7);
-						::SelectObject(hDC, brushOld);
-						::DeleteObject(brush);
-						::SelectObject(hDC, penOld);
-						::DeleteObject(pen);
+						SelectBrush(hDC, brushOld);
+						DeleteBrush(brush);
+						SelectPen(hDC, penOld);
+						DeletePen(pen);
 						::ReleaseDC(hWnd, hDC);
 					}
 				}
diff -Nru scite-4.1.0/scite/win32/SciTEWin.cxx scite-4.1.2/scite/win32/SciTEWin.cxx
--- scite-4.1.0/scite/win32/SciTEWin.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/win32/SciTEWin.cxx	2018-10-02 01:35:45.000000000 +0000
@@ -132,7 +132,7 @@
 	return (keyval > 0) ? (keyval | (modsInKey<<16)) : 0;
 }
 
-bool SciTEKeys::MatchKeyCode(long parsedKeyCode, int keyval, int modifiers) {
+bool SciTEKeys::MatchKeyCode(long parsedKeyCode, int keyval, int modifiers) noexcept {
 	return parsedKeyCode && !(0xFFFF0000 & (keyval | modifiers)) && (parsedKeyCode == (keyval | (modifiers<<16)));
 }
 
@@ -435,7 +435,7 @@
 void SciTEWin::ReadPropertiesInitial() {
 	SciTEBase::ReadPropertiesInitial();
 	if (tabMultiLine) {	// Windows specific!
-		const long wl = ::GetWindowLong(HwndOf(wTabBar), GWL_STYLE);
+		const long wl = GetWindowStyle(HwndOf(wTabBar));
 		::SetWindowLong(HwndOf(wTabBar), GWL_STYLE, wl | TCS_MULTILINE);
 	}
 }
@@ -553,18 +553,17 @@
 	const Sci_CharacterRange cr = GetSelection();
 	std::ostringstream oss;
 	SaveToStreamRTF(oss, static_cast<int>(cr.cpMin), static_cast<int>(cr.cpMax));
-	std::string rtf = oss.str();
-	size_t len = rtf.length();
-	HGLOBAL hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, len + 1);
+	const std::string rtf = oss.str();
+	const size_t len = rtf.length() + 1;	// +1 for NUL
+	HGLOBAL hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, len);
 	if (hand) {
 		::OpenClipboard(MainHWND());
 		::EmptyClipboard();
 		char *ptr = static_cast<char *>(::GlobalLock(hand));
 		if (ptr) {
 			memcpy(ptr, rtf.c_str(), len);
-			ptr[len] = '\0';
+			::GlobalUnlock(hand);
 		}
-		::GlobalUnlock(hand);
 		::SetClipboardData(::RegisterClipboardFormat(CF_RTF), hand);
 		::CloseClipboard();
 	}
@@ -574,16 +573,17 @@
 	if (filePath.IsUntitled())
 		return;
 
-	GUI::gui_string clipText(filePath.AsInternal());
+	const GUI::gui_string clipText(filePath.AsInternal());
 	const size_t blobSize = sizeof(GUI::gui_char)*(clipText.length()+1);
 	if (::OpenClipboard(MainHWND())) {
 		HGLOBAL hand = ::GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, blobSize);
 		if (hand) {
 			::EmptyClipboard();
 			GUI::gui_char *ptr = static_cast<GUI::gui_char*>(::GlobalLock(hand));
-			if (ptr)
+			if (ptr) {
 				memcpy(ptr, clipText.c_str(), blobSize);
-			::GlobalUnlock(hand);
+				::GlobalUnlock(hand);
+			}
 			::SetClipboardData(CF_UNICODETEXT, hand);
 		}
 		::CloseClipboard();
@@ -1297,7 +1297,8 @@
 }
 
 bool SciTEWin::PerformOnNewThread(Worker *pWorker) {
-	const uintptr_t result = _beginthread(WorkerThread, 1024 * 1024, static_cast<void *>(pWorker));
+	void *threadArgument = pWorker;
+	const uintptr_t result = _beginthread(WorkerThread, 1024 * 1024, threadArgument);
 	return result != static_cast<uintptr_t>(-1);
 }
 
@@ -1403,7 +1404,7 @@
 	UIAvailable();
 }
 
-static bool IsASpace(int ch) {
+static bool IsASpace(int ch) noexcept {
 	return (ch == ' ') || (ch == '\t');
 }
 
@@ -1544,7 +1545,7 @@
 				colourIndex = COLOR_3DFACE;
 		}
 		HPEN pen = ::CreatePen(0, 1, ::GetSysColor(colourIndex));
-		HPEN penOld = static_cast<HPEN>(::SelectObject(hDC, pen));
+		HPEN penOld = SelectPen(hDC, pen);
 		if (pSciTEWin->splitVertical) {
 			::MoveToEx(hDC, xBorder + i, 0, 0);
 			::LineTo(hDC, xBorder + i, heightClient);
@@ -1552,8 +1553,8 @@
 			::MoveToEx(hDC, 0, yBorder + i, 0);
 			::LineTo(hDC, widthClient, yBorder + i);
 		}
-		::SelectObject(hDC, penOld);
-		::DeleteObject(pen);
+		SelectPen(hDC, penOld);
+		DeletePen(pen);
 	}
 }
 
@@ -2052,21 +2053,18 @@
 
 LRESULT PASCAL SciTEWin::TWndProc(
     HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) {
-
+	if (iMessage == WM_CREATE) {
+		SciTEWin *scitePassed = static_cast<SciTEWin *>(SetWindowPointerFromCreate(hWnd, lParam));
+		scitePassed->wSciTE = hWnd;
+	}
 	// Find C++ object associated with window.
 	SciTEWin *scite = static_cast<SciTEWin *>(PointerFromWindow(hWnd));
 	// scite will be zero if WM_CREATE not seen yet
-	if (!scite) {
-		if (iMessage == WM_CREATE) {
-			LPCREATESTRUCT cs = reinterpret_cast<LPCREATESTRUCT>(lParam);
-			scite = static_cast<SciTEWin *>(cs->lpCreateParams);
-			scite->wSciTE = hWnd;
-			SetWindowPointer(hWnd, scite);
-			return scite->WndProc(iMessage, wParam, lParam);
-		} else
-			return ::DefWindowProcW(hWnd, iMessage, wParam, lParam);
-	} else
+	if (scite) {
 		return scite->WndProc(iMessage, wParam, lParam);
+	} else {
+		return ::DefWindowProcW(hWnd, iMessage, wParam, lParam);
+	}
 }
 
 LRESULT ContentWin::WndProc(UINT iMessage, WPARAM wParam, LPARAM lParam) {
diff -Nru scite-4.1.0/scite/win32/SciTEWinDlg.cxx scite-4.1.2/scite/win32/SciTEWinDlg.cxx
--- scite-4.1.0/scite/win32/SciTEWinDlg.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/win32/SciTEWinDlg.cxx	2018-09-09 09:00:25.000000000 +0000
@@ -15,14 +15,14 @@
     int duration) {	///< Duration of the flash state.
 
 	HDC hDC = ::GetDC(hWnd);
-	if (hDC != NULL) {
+	if (hDC) {
 		RECT rc;
 		::GetClientRect(hWnd, &rc);
-		::FillRect(hDC, &rc, static_cast<HBRUSH>(GetStockObject(BLACK_BRUSH)));
+		::FillRect(hDC, &rc, GetStockBrush(BLACK_BRUSH));
 		::Sleep(duration);
 		::ReleaseDC(hWnd, hDC);
 	}
-	::InvalidateRect(hWnd, NULL, true);
+	::InvalidateRect(hWnd, nullptr, true);
 }
 
 /**
@@ -674,11 +674,11 @@
 				             static_cast<int>(sHeader.length()), NULL);
 				::SetTextAlign(hdc, ta);
 				HPEN pen = ::CreatePen(0, 1, sdHeader.ForeAsLong());
-				HPEN penOld = static_cast<HPEN>(::SelectObject(hdc, pen));
+				HPEN penOld = SelectPen(hdc, pen);
 				::MoveToEx(hdc, frPrint.rc.left, frPrint.rc.top - headerLineHeight / 4, NULL);
 				::LineTo(hdc, frPrint.rc.right, frPrint.rc.top - headerLineHeight / 4);
-				::SelectObject(hdc, penOld);
-				::DeleteObject(pen);
+				SelectPen(hdc, penOld);
+				DeletePen(pen);
 			}
 		}
 
@@ -703,12 +703,12 @@
 				             static_cast<int>(sFooter.length()), NULL);
 				::SetTextAlign(hdc, ta);
 				HPEN pen = ::CreatePen(0, 1, sdFooter.ForeAsLong());
-				HPEN penOld = static_cast<HPEN>(::SelectObject(hdc, pen));
+				HPEN penOld = SelectPen(hdc, pen);
 				::SetBkColor(hdc, sdFooter.ForeAsLong());
 				::MoveToEx(hdc, frPrint.rc.left, frPrint.rc.bottom + footerLineHeight / 4, NULL);
 				::LineTo(hdc, frPrint.rc.right, frPrint.rc.bottom + footerLineHeight / 4);
-				::SelectObject(hdc, penOld);
-				::DeleteObject(pen);
+				SelectPen(hdc, penOld);
+				DeletePen(pen);
 			}
 
 			::EndPage(hdc);
@@ -796,23 +796,22 @@
 	}
 
 	void SetCheck(int id, bool value) {
-		::SendMessage(::GetDlgItem(hDlg, id), BM_SETCHECK,
-			value ? BST_CHECKED : BST_UNCHECKED, 0);
+		Button_SetCheck(Item(id), value ? BST_CHECKED : BST_UNCHECKED);
 	}
 
 	bool Checked(int id) {
-		return BST_CHECKED == ::SendMessage(::GetDlgItem(hDlg, id), BM_GETCHECK, 0, 0);
+		return BST_CHECKED == Button_GetCheck(Item(id));
 	}
 
 	void FillComboFromMemory(int id, const ComboMemory &mem, bool useTop = false) {
 		HWND combo = Item(id);
-		::SendMessage(combo, CB_RESETCONTENT, 0, 0);
+		ComboBox_ResetContent(combo);
 		for (int i = 0; i < mem.Length(); i++) {
 			GUI::gui_string gs = GUI::StringFromUTF8(mem.At(i));
 			ComboBox_AddString(combo, gs.c_str());
 		}
 		if (useTop) {
-			::SendMessage(combo, CB_SETCURSEL, 0, 0);
+			ComboBox_SetCurSel(combo, 0);
 		}
 	}
 
@@ -932,7 +931,7 @@
 		if (FindReplaceAdvanced()) {
 			dlg.SetCheck(IDFINDSTYLE, findInStyle);
 			dlg.Enable(IDFINDSTYLE, findInStyle);
-			::SendMessage(dlg.Item(IDFINDSTYLE), EM_LIMITTEXT, 3, 1);
+			Edit_LimitText(dlg.Item(IDFINDSTYLE), 3);
 			::SetDlgItemInt(hDlg, IDFINDSTYLE, wEditor.Call(SCI_GETSTYLEAT, wEditor.Call(SCI_GETCURRENTPOS)), FALSE);
 		}
 		return TRUE;
@@ -1394,7 +1393,7 @@
 			::SetDlgItemInt(hDlg, IDCURRLINE, lineNumber, FALSE);
 			::SetDlgItemInt(hDlg, IDCURRLINECHAR, characterOnLine, FALSE);
 			::SetDlgItemInt(hDlg, IDLASTLINE, wEditor.Call(SCI_GETLINECOUNT), FALSE);
-                }
+		}
 		return TRUE;
 
 	case WM_CLOSE:
diff -Nru scite-4.1.0/scite/win32/SciTEWin.h scite-4.1.2/scite/win32/SciTEWin.h
--- scite-4.1.0/scite/win32/SciTEWin.h	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/win32/SciTEWin.h	2018-10-02 01:35:45.000000000 +0000
@@ -144,7 +144,7 @@
 public:
 	ContentWin() noexcept : pSciTEWin(nullptr), capturedMouse(false) {
 	}
-	void SetSciTE(SciTEWin *pSciTEWin_) {
+	void SetSciTE(SciTEWin *pSciTEWin_) noexcept {
 		pSciTEWin = pSciTEWin_;
 	}
 	void Paint(HDC hDC, GUI::Rectangle rcPaint);
@@ -404,7 +404,7 @@
 	std::string EncodeString(const std::string &s) override;
 	std::string GetRangeInUIEncoding(GUI::ScintillaWindow &win, int selStart, int selEnd) override;
 
-	HACCEL GetAcceleratorTable() {
+	HACCEL GetAcceleratorTable() noexcept {
 		return hAccTable;
 	}
 
@@ -425,22 +425,22 @@
 
 // Common minor conversions
 
-inline GUI::Point PointFromLong(LPARAM lPoint) {
+inline GUI::Point PointFromLong(LPARAM lPoint) noexcept {
 	return GUI::Point(static_cast<short>(LOWORD(lPoint)), static_cast<short>(HIWORD(lPoint)));
 }
 
-inline int ControlIDOfWParam(WPARAM wParam) {
+inline int ControlIDOfWParam(WPARAM wParam) noexcept {
 	return wParam & 0xffff;
 }
 
-inline HWND HwndOf(GUI::Window w) {
+inline HWND HwndOf(GUI::Window w) noexcept {
 	return static_cast<HWND>(w.GetID());
 }
 
-inline HMENU HmenuID(size_t id) {
+inline HMENU HmenuID(size_t id) noexcept {
 	return reinterpret_cast<HMENU>(id);
 }
 
-inline POINT *PointPointer(GUI::Point *pt) {
+inline POINT *PointPointer(GUI::Point *pt) noexcept {
 	return reinterpret_cast<POINT *>(pt);
 }
diff -Nru scite-4.1.0/scite/win32/Strips.cxx scite-4.1.2/scite/win32/Strips.cxx
--- scite-4.1.0/scite/win32/Strips.cxx	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/win32/Strips.cxx	2018-09-09 09:00:25.000000000 +0000
@@ -15,6 +15,13 @@
 	::SetWindowLongPtr(hWnd, 0, reinterpret_cast<LONG_PTR>(ptr));
 }
 
+void *SetWindowPointerFromCreate(HWND hWnd, LPARAM lParam) {
+	LPCREATESTRUCT pcs = reinterpret_cast<LPCREATESTRUCT>(lParam);
+	void *ptr = pcs->lpCreateParams;
+	SetWindowPointer(hWnd, ptr);
+	return ptr;
+}
+
 GUI::gui_string TextOfWindow(HWND hWnd) {
 	const int len = ::GetWindowTextLengthW(hWnd);
 	std::vector<GUI::gui_char> itemText(len+1);
@@ -43,8 +50,7 @@
 }
 
 void CheckButton(const GUI::Window &wButton, bool checked) {
-	::SendMessage(HwndOf(wButton),
-		BM_SETCHECK, checked ? BST_CHECKED : BST_UNCHECKED, 0);
+	Button_SetCheck(HwndOf(wButton), checked ? BST_CHECKED : BST_UNCHECKED);
 }
 
 SIZE SizeButton(const GUI::Window &wButton) {
@@ -61,11 +67,11 @@
 
 int WidthText(HFONT hfont, const GUI::gui_char *text) {
 	HDC hdcMeasure = ::CreateCompatibleDC(NULL);
-	HFONT hfontOriginal = static_cast<HFONT>(::SelectObject(hdcMeasure, hfont));
+	HFONT hfontOriginal = SelectFont(hdcMeasure, hfont);
 	RECT rcText = {0,0, 2000, 2000};
 	::DrawText(hdcMeasure, text, -1, &rcText, DT_CALCRECT);
 	const int width = rcText.right - rcText.left;
-	::SelectObject(hdcMeasure, hfontOriginal);
+	SelectFont(hdcMeasure, hfontOriginal);
 	::DeleteDC(hdcMeasure);
 	return width;
 }
@@ -106,10 +112,10 @@
 	GUI::gui_string text = GUI::StringFromUTF8(s);
 	ComboBox_SetText(combo, text.c_str());
 	if (selection == ComboSelection::all) {
-		::SendMessage(combo, CB_SETEDITSEL, 0, MAKELPARAM(0, -1));
+		ComboBox_SetEditSel(combo, 0, -1);
 	} else {
 		const size_t textLength = text.length();
-		::SendMessage(combo, CB_SETEDITSEL, 0, MAKELPARAM(textLength, textLength));
+		ComboBox_SetEditSel(combo, textLength, textLength);
 	}
 }
 
@@ -126,20 +132,19 @@
 
 LRESULT PASCAL BaseWin::StWndProc(
     HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam) {
+	if (iMessage == WM_CREATE) {
+		// Pointer to BaseWin passed with WM_CREATE so remember in window pointer
+		BaseWin *basePassed = static_cast<BaseWin *>(SetWindowPointerFromCreate(hWnd, lParam));
+		basePassed->SetID(hWnd);
+	}
 	// Find C++ object associated with window.
 	BaseWin *base = static_cast<BaseWin *>(::PointerFromWindow(hWnd));
-	// scite will be zero if WM_CREATE not seen yet
-	if (!base) {
-		if (iMessage == WM_CREATE) {
-			LPCREATESTRUCT cs = reinterpret_cast<LPCREATESTRUCT>(lParam);
-			base = static_cast<BaseWin *>(cs->lpCreateParams);
-			SetWindowPointer(hWnd, base);
-			base->SetID(hWnd);
-			return base->WndProc(iMessage, wParam, lParam);
-		} else
-			return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
-	} else
+	// base will be zero if WM_CREATE not seen yet
+	if (base) {
 		return base->WndProc(iMessage, wParam, lParam);
+	} else {
+		return ::DefWindowProc(hWnd, iMessage, wParam, lParam);
+	}
 }
 
 static const char *textFindPrompt = "Fi&nd:";
@@ -335,24 +340,24 @@
 		return true;
 	default:
 		if ((::GetKeyState(VK_MENU) & 0x80000000) != 0) {
-			HWND wChild = ::GetWindow(Hwnd(), GW_CHILD);
+			HWND wChild = GetFirstChild(Hwnd());
 			while (wChild) {
 				const GUI::gui_string className = ClassNameOfWindow(wChild);
 				if ((className == TEXT("Button")) || (className == TEXT("Static"))) {
-					GUI::gui_string caption = TextOfWindow(wChild);
+					const GUI::gui_string caption = TextOfWindow(wChild);
 					for (int i=0; caption[i]; i++) {
 						if ((caption[i] == L'&') && (toupper(caption[i+1]) == static_cast<int>(key))) {
 							if (className == TEXT("Button")) {
 								::SendMessage(wChild, BM_CLICK, 0, 0);
 							} else {	// Static caption
-								wChild = ::GetWindow(wChild, GW_HWNDNEXT);
+								wChild = GetNextSibling(wChild);
 								::SetFocus(wChild);
 							}
 							return true;
 						}
 					}
 				}
-				wChild = ::GetWindow(wChild, GW_HWNDNEXT);
+				wChild = GetNextSibling(wChild);
 			};
 		}
 	}
@@ -520,7 +525,7 @@
 }
 
 LRESULT Strip::CustomDraw(NMHDR *pnmh) {
-	const int btnStyle = ::GetWindowLong(pnmh->hwndFrom, GWL_STYLE);
+	const int btnStyle = GetWindowStyle(pnmh->hwndFrom);
 	if ((btnStyle & BS_AUTOCHECKBOX) != BS_AUTOCHECKBOX) {
 		return CDRF_DODEFAULT;
 	}
@@ -535,7 +540,7 @@
 		if (!hThemeButton) {
 			return CDRF_DODEFAULT;
 		}
-		const bool checked = ::SendMessage(pnmh->hwndFrom, BM_GETCHECK, 0, 0) == BST_CHECKED;
+		const bool checked = Button_GetCheck(pnmh->hwndFrom) == BST_CHECKED;
 
 		int buttonAppearence = checked ? TS_CHECKED : TS_NORMAL;
 		if (pcd->uItemState & CDIS_SELECTED)
@@ -571,11 +576,11 @@
 		const int yOffset = ((rcButton.bottom - rcButton.top) - rbmi.bmiHeader.biHeight) / 2;
 
 		HDC hdcBM = ::CreateCompatibleDC(NULL);
-		HBITMAP hbmOriginal = static_cast<HBITMAP>(::SelectObject(hdcBM, hBitmap));
+		HBITMAP hbmOriginal = SelectBitmap(hdcBM, hBitmap);
 		::TransparentBlt(pcd->hdc, xOffset, yOffset,
 			rbmi.bmiHeader.biWidth, rbmi.bmiHeader.biHeight,
 			hdcBM, 0, 0, rbmi.bmiHeader.biWidth, rbmi.bmiHeader.biHeight, colourTransparent);
-		::SelectObject(hdcBM, hbmOriginal);
+		SelectBitmap(hdcBM, hbmOriginal);
 		::DeleteDC(hdcBM);
 
 		if (pcd->uItemState & CDIS_FOCUS) {
@@ -609,9 +614,16 @@
 		else
 			return ::DefWindowProc(Hwnd(), iMessage, wParam, lParam);
 
-	case WM_SETCURSOR:
-		::SetCursor(::LoadCursor(NULL, IDC_ARROW));
-		break;
+	case WM_SETCURSOR: {
+			HWND hWnd = reinterpret_cast<HWND>(wParam);
+			const GUI::gui_string className = ClassNameOfWindow(hWnd);
+			if (className == TEXT("Edit") || className == TEXT("ComboBox")) {
+				return ::DefWindowProc(Hwnd(), iMessage, wParam, lParam);
+			} else {
+				::SetCursor(::LoadCursor(NULL, IDC_ARROW));
+				return 0;
+			}
+		}
 
 	case WM_SIZE:
 		Size();
@@ -1629,8 +1641,10 @@
 			return scChange;
 		case EN_UPDATE:
 			return scUnknown;
+		case CBN_SETFOCUS:
 		case EN_SETFOCUS:
 			return scFocusIn;
+		case CBN_KILLFOCUS:
 		case EN_KILLFOCUS:
 			return scFocusOut;
 		default:
@@ -1695,7 +1709,7 @@
 				ctl.widthDesired = 100;
 				ctl.fixedWidth = false;
 				ctl.w = ::CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("ComboBox"), ctl.text.c_str(),
-					WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL,
+					WS_CHILD | WS_TABSTOP | WS_CLIPSIBLINGS | CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL,
 					left, top, ctl.widthDesired, 180,
 					Hwnd(), HmenuID(controlID), ::GetModuleHandle(NULL), 0);
 				break;
diff -Nru scite-4.1.0/scite/win32/Strips.h scite-4.1.2/scite/win32/Strips.h
--- scite-4.1.0/scite/win32/Strips.h	2018-06-18 23:06:25.000000000 +0000
+++ scite-4.1.2/scite/win32/Strips.h	2018-09-09 09:00:25.000000000 +0000
@@ -14,6 +14,7 @@
 
 void *PointerFromWindow(HWND hWnd);
 void SetWindowPointer(HWND hWnd, void *ptr);
+void *SetWindowPointerFromCreate(HWND hWnd, LPARAM lParam);
 GUI::gui_string TextOfWindow(HWND hWnd);
 GUI::gui_string ClassNameOfWindow(HWND hWnd);