2 files changed, 33 insertions, 24 deletions
diff --git a/include/Scintilla.h b/include/Scintilla.h
index 7640dfaa8..04d67e78a 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -47,9 +47,7 @@ void Scintilla_RegisterClasses(HINSTANCE hInstance);
 #define SCI_CANREDO SCI_START + 16
 #define SCI_MARKERLINEFROMHANDLE SCI_START + 17
 #define SCI_MARKERDELETEHANDLE SCI_START + 18
-
-#define SC_UNDOCOLLECT_NONE 0
-#define SC_UNDOCOLLECT_AUTOSTART 1
+#define SCI_GETUNDOCOLLECTION SCI_START + 19
 
 #define SCWS_INVISIBLE 0
 #define SCWS_VISIBLEALWAYS 1
@@ -77,6 +75,7 @@ void Scintilla_RegisterClasses(HINSTANCE hInstance);
 // This is the same value as CP_UTF8 in Windows
 #define SC_CP_UTF8 65001
 
+#define SCI_GETBUFFEREDDRAW SCI_START + 34
 #define SCI_SETBUFFEREDDRAW SCI_START + 35
 #define SCI_SETTABWIDTH SCI_START + 36
 #define SCI_SETCODEPAGE SCI_START + 37
@@ -227,6 +226,10 @@ void Scintilla_RegisterClasses(HINSTANCE hInstance);
 #define SCI_SETHIGHLIGHTGUIDE SCI_START + 134
 #define SCI_GETHIGHLIGHTGUIDE SCI_START + 135
 #define SCI_GETLINEENDPOSITION SCI_START + 136
+#define SCI_GETCODEPAGE SCI_START + 137
+#define SCI_GETCARETFORE SCI_START + 138
+#define SCI_GETUSEPALETTE SCI_START + 139
+#define SCI_GETREADONLY SCI_START + 140
 
 #define SCI_CALLTIPSHOW SCI_START + 200
 #define SCI_CALLTIPCANCEL SCI_START + 201
@@ -342,6 +345,8 @@ void Scintilla_RegisterClasses(HINSTANCE hInstance);
 #define SCI_ADDREFDOCUMENT SCI_START + 376
 #define SCI_RELEASEDOCUMENT SCI_START + 377
 
+#define SCI_GETMODEVENTMASK SCI_START + 378
+
 // GTK+ Specific
 #define SCI_GRABFOCUS SCI_START + 400
 
@@ -427,23 +432,9 @@ struct SCNotification {
 
 #ifdef INCLUDE_DEPRECATED_FEATURES
 
-#define SCI_CHANGEPOSITION SCI_START + 22
-
-// Default style settings. These are deprecated and will be removed in a future version.
-#define SCI_SETFORE SCI_START + 60
-#define SCI_SETBACK SCI_START + 61
-#define SCI_SETBOLD SCI_START + 62
-#define SCI_SETITALIC SCI_START + 63
-#define SCI_SETSIZE SCI_START + 64
-#define SCI_SETFONT SCI_START + 65
-
-#define SCI_APPENDUNDOSTARTACTION SCI_START + 74
-
-#define SC_UNDOCOLLECT_MANUALSTART 2
-
-// Deprecated in release 1.22
-#define SCI_SETMARGINWIDTH SCI_START + 34
-#define SCI_SETLINENUMBERWIDTH SCI_START + 38
+// Deprecated in 1.27
+#define SC_UNDOCOLLECT_NONE 0
+#define SC_UNDOCOLLECT_AUTOSTART 1
 
 #endif
 
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 1343cbfdc..d2195d3ef 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -81,12 +81,9 @@ get int GetStyleAt=2010(position pos,)
 # Redoes the next action on the undo history
 fun void Redo=2011(,)
 
-val SC_UNDOCOLLECT_NONE=0
-val SC_UNDOCOLLECT_AUTOSTART=1
-
 # Choose between collecting actions into the undo 
 # history and discarding them.
-set void SetUndoCollection=2012(int collectUndo,)
+set void SetUndoCollection=2012(bool collectUndo,)
 
 # Select all the text in the document.
 fun void SelectAll=2013(,)
@@ -108,6 +105,9 @@ fun int MarkerLineFromHandle=2017(int handle,)
 # Delete a marker.
 fun void MarkerDeleteHandle=2018(int handle,)
 
+# Is undo history being collected?
+get bool GetUndoCollection=2019(,)
+
 val SCWS_INVISIBLE=0
 val SCWS_VISIBLEALWAYS=1
 val SCWS_VISIBLEAFTERINDENT=2
@@ -158,6 +158,9 @@ fun void StartStyling=2032(position pos, int mask)
 # and move the current styling position to after this newly styled segment.
 fun void SetStyling=2033(int length, int style)
 
+# Is drawing done first into a buffer or direct to the screen.
+get bool GetBufferedDraw=2034(,)
+
 # If drawing is buffered then each line of text is drawn into a bitmap buffer
 # before drawing it to the screen to avoid flicker.
 set void SetBufferedDraw=2035(bool buffered,)
@@ -466,6 +469,18 @@ get int GetHighlightGuide=2135(,)
 # Get the position after the last visible characters on a line.
 get int GetLineEndPosition=2136(int line,)
 
+# Get the code page used to interpret the bytes of the document as characters.
+get int GetCodePage=2137(,)
+
+# Get the foreground colour of the caret.
+get colour GetCaretFore=2138(,)
+
+# In palette mode?
+get bool GetUsePalette=2139(,)
+
+# In read-only mode?
+get bool GetReadOnly=2140(,)
+
 # Show a call tip containing a definition near position pos.
 fun void CallTipShow=2200(position pos, string definition)
 
@@ -758,6 +773,9 @@ fun void AddRefDocument=2376(, int doc)
 # Release a reference to the document, deleting document if it fades to black.
 fun void ReleaseDocument=2377(, int doc)
 
+# Get which document modification events are sent to the container.
+get int GetModEventMask=2378(,)
+
 # Set the focus to this Scintilla widget.
 fun void GrabFocus=2400(,)