Release v4.2.25r1110.

zufuliu · Feb 12, 2018 · 6317ded · 6317ded
1 parent 163979d
commit 6317ded
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git a/res/Notepad2.exe.manifest b/res/Notepad2.exe.manifest
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad2"
     processorArchitecture="*"
-    version="4.2.25.1096"
+    version="4.2.25.1110"
     type="win32"
   />
   <description>Notepad2</description>

diff --git a/scintilla/include/Scintilla.h b/scintilla/include/Scintilla.h
@@ -1216,12 +1216,19 @@ struct SCNotification {
 #define SCI_SETKEYSUNICODE 2521
 #define SCI_GETKEYSUNICODE 2522
 
+#define SCI_GETTWOPHASEDRAW 2283
+#define SCI_SETTWOPHASEDRAW 2284
+
 #define CharacterRange Sci_CharacterRange
 #define TextRange Sci_TextRange
 #define TextToFind Sci_TextToFind
 #define RangeToFormat Sci_RangeToFormat
 #define NotifyHeader Sci_NotifyHeader
 
+#define SCI_SETSTYLEBITS 2090
+#define SCI_GETSTYLEBITS 2091
+#define SCI_GETSTYLEBITSNEEDED 4011
+
 #endif
 
 #endif
diff --git a/scintilla/scripts/HeaderCheck.py b/scintilla/scripts/HeaderCheck.py
@@ -89,5 +89,4 @@ def CheckFiles(root):
                     #~ return
         #print("Master header list", " ".join(masterHeaderList))
 
-
 CheckFiles("..")
diff --git a/scintilla/src/DBCS.cxx b/scintilla/src/DBCS.cxx
@@ -7,6 +7,8 @@
 
 #include "DBCS.h"
 
+using namespace Scintilla;
+
 namespace Scintilla {
 
 bool DBCSIsLeadByte(int codePage, char ch) {

diff --git a/scintilla/src/Position.h b/scintilla/src/Position.h
@@ -12,7 +12,7 @@
  * A Position is a position within a document between two characters or at the beginning or end.
  * Sometimes used as a character index where it identifies the character after the position.
  * A Line is a document or screen line.
-*/
+ */
 
 namespace Sci {
 

diff --git a/src/VersionRev.h b/src/VersionRev.h
@@ -1,3 +1,3 @@
-#define VERSION_HASH _T("cffabe8")
-#define VERSION_REV 1096
-#define VERSION_REV_FULL _T("1096 (cffabe8)")
+#define VERSION_HASH _T("163979d")
+#define VERSION_REV 1110
+#define VERSION_REV_FULL _T("1110 (163979d)")
diff --git a/version.txt b/version.txt
@@ -4,7 +4,7 @@ git clone https://github.com/XhmikosR/notepad2-mod.git
 
 Scintilla
 hg clone http://hg.code.sf.net/p/scintilla/code scintilla
-2018-02-10 6452:1bf8b7c50995
+2018-02-12 6453:71a51a9a6048
 
 SciTE
 hg clone http://hg.code.sf.net/p/scintilla/scite
Original file line number	Diff line number	Diff line change
Expand Up		@@ -89,5 +89,4 @@ def CheckFiles(root):
		#~ return
		#print("Master header list", " ".join(masterHeaderList))


		CheckFiles("..")