From 2b650b7176bbbcdeb824a0a57ddb8b22b765ef72 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Fri, 15 Jun 2018 14:45:14 +0200
Subject: [PATCH] + upd: merge Scintilla's preparations for upcoming release
 v.4.1.0

---
 scintilla/doc/ScintillaDownload.html |  10 +++++-----
 scintilla/doc/ScintillaHistory.html  |   4 ++--
 scintilla/doc/index.html             |  10 ++++------
 scintilla/src/ExternalLexer.h        |   1 -
 scintilla/version.txt                |   2 +-
 src/Version.h                        | Bin 12114 -> 12112 bytes
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html
index 2807dbe83..d78012f4e 100644
--- a/scintilla/doc/ScintillaDownload.html
+++ b/scintilla/doc/ScintillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/scintilla405.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla410.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla405.tgz">
+	<a href="https://www.scintilla.org/scintilla410.tgz">
           GTK+/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 4.0.5
+       Release 4.1.0
     </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/scintilla405.zip">zip format</a> (1600K) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla405.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
+       <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>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html
index 3e0db69be..ec670d803 100644
--- a/scintilla/doc/ScintillaHistory.html
+++ b/scintilla/doc/ScintillaHistory.html
@@ -546,10 +546,10 @@
     </h3>
     <ul>
 	<li>
-	Released 10 May 2018.
+	Released 19 June 2018.
 	</li>
 	<li>
-	Experimental and incomplete support added for bidirectional text on Windows using DirectWrite for
+	Experimental and incomplete support added for bidirectional text on Windows using DirectWrite and Cocoa for
 	UTF-8 documents by calling SCI_SETBIDIRECTIONAL(SC_BIDIRECTIONAL_L2R).
 	This allows documents that contain Arabic or Hebrew to be edited more easily in a way that is similar
 	to other editors.
diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html
index 176a7541f..9e6bf08a3 100644
--- a/scintilla/doc/index.html
+++ b/scintilla/doc/index.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20180510" />
+    <meta name="Date.Modified" content="20180619" />
     <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.0.5<br />
-           Site last modified May 10 2018</font>
+          <font color="#FFCC99" size="3"> Release version 4.1.0<br />
+           Site last modified June 19 2018</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,12 +72,10 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <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>
-      <li>Version 4.0.2 fixes some bugs on macOS 10.13.</li>
-      <li>Version 4.0.1 makes some changes to namespaces and headers. Scrolling is smoother on Cocoa.</li>
-      <li>Version 4.0.0 is an unstable major release with changes to some internal and external interfaces.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff --git a/scintilla/src/ExternalLexer.h b/scintilla/src/ExternalLexer.h
index ea7f20958..f0af9834a 100644
--- a/scintilla/src/ExternalLexer.h
+++ b/scintilla/src/ExternalLexer.h
@@ -16,7 +16,6 @@
 
 namespace Scintilla {
 
-typedef void*(EXT_LEXER_DECL *GetLexerFunction)(unsigned int Index);
 typedef int (EXT_LEXER_DECL *GetLexerCountFn)();
 typedef void (EXT_LEXER_DECL *GetLexerNameFn)(unsigned int Index, char *name, int buflength);
 typedef LexerFactoryFunction(EXT_LEXER_DECL *GetLexerFactoryFunction)(unsigned int Index);
diff --git a/scintilla/version.txt b/scintilla/version.txt
index ec8785ec9..17e344e7c 100644
--- a/scintilla/version.txt
+++ b/scintilla/version.txt
@@ -1 +1 @@
-405
+410
diff --git a/src/Version.h b/src/Version.h
index 95c4f66d6e4276c0170a389a8daaea8e29233eca..887f5807521a768be6ce071099684087990d1a2a 100644
GIT binary patch
delta 12
TcmcZ<cOh;=gy`ld(I1ikDDefa

delta 14
VcmcZ*cPVZ|gear-=5W!Uk^nH|1=#=q