From 4de024017a7e8a191f3591b98508d69ca022e7e8 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Fri, 8 Mar 2019 11:33:42 +0100
Subject: [PATCH] + upd: sync with current Scintilla GitHuv mirror version
 (4.1.4 release)

---
 scintilla/doc/ScintillaDownload.html | 4 ++--
 scintilla/include/Scintilla.h        | 1 -
 scintilla/include/Scintilla.iface    | 1 -
 scintilla/src/ViewStyle.cxx          | 2 ++
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html
index 9e40a0850..30316ffb7 100644
--- a/scintilla/doc/ScintillaDownload.html
+++ b/scintilla/doc/ScintillaDownload.html
@@ -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/scintilla414.zip">zip format</a> (1600K) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla414.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla414.zip">zip format</a> (1700K) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla414.tgz">tgz format</a> (1500K) 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/include/Scintilla.h b/scintilla/include/Scintilla.h
index 9c805c1e3..6ff4c49c1 100644
--- a/scintilla/include/Scintilla.h
+++ b/scintilla/include/Scintilla.h
@@ -835,7 +835,6 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define CARETSTYLE_BLOCK 2
 #define CARETSTYLE_OVERSTRIKE_BAR 0
 #define CARETSTYLE_OVERSTRIKE_BLOCK 16
-#define CARETSTYLE_INS_MASK 0xF
 #define SCI_SETCARETSTYLE 2512
 #define SCI_GETCARETSTYLE 2513
 #define SCI_SETINDICATORCURRENT 2500
diff --git a/scintilla/include/Scintilla.iface b/scintilla/include/Scintilla.iface
index e19f3cfb2..8fce94606 100644
--- a/scintilla/include/Scintilla.iface
+++ b/scintilla/include/Scintilla.iface
@@ -2187,7 +2187,6 @@ val CARETSTYLE_LINE=1
 val CARETSTYLE_BLOCK=2
 val CARETSTYLE_OVERSTRIKE_BAR=0
 val CARETSTYLE_OVERSTRIKE_BLOCK=16
-val CARETSTYLE_INS_MASK=0xF
 
 # Set the style of the caret to be drawn.
 set void SetCaretStyle=2512(int caretStyle,)
diff --git a/scintilla/src/ViewStyle.cxx b/scintilla/src/ViewStyle.cxx
index e650b1062..fc3a8489c 100644
--- a/scintilla/src/ViewStyle.cxx
+++ b/scintilla/src/ViewStyle.cxx
@@ -27,6 +27,8 @@
 #include "Style.h"
 #include "ViewStyle.h"
 
+#define CARETSTYLE_INS_MASK 0xF
+
 using namespace Scintilla;
 
 MarginStyle::MarginStyle(int style_, int width_, int mask_) :