From bbf8cac83a0fbba3b68a17d119a559ecd521997a Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Sun, 19 Apr 2009 09:38:40 +0000
Subject: Added UNDO_MAY_COALESCE flag to AddUndoAction.

---
 include/Scintilla.h     | 1 +
 include/Scintilla.iface | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/Scintilla.h b/include/Scintilla.h
index 8c1232b8a..27b4e3795 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -705,6 +705,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_ANNOTATIONGETVISIBLE 2549
 #define SCI_ANNOTATIONSETSTYLEOFFSET 2550
 #define SCI_ANNOTATIONGETSTYLEOFFSET 2551
+#define UNDO_MAY_COALESCE 1
 #define SCI_ADDUNDOACTION 2560
 #define SCI_STARTRECORD 3001
 #define SCI_STOPRECORD 3002
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index e51e9274c..87783ccc0 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -1902,8 +1902,10 @@ set void AnnotationSetStyleOffset=2550(int style,)
 # Get the start of the range of style numbers used for annotations
 get int AnnotationGetStyleOffset=2551(,)
 
+val UNDO_MAY_COALESCE=1
+
 # Add a container action to the undo stack
-fun void AddUndoAction=2560(int token,)
+fun void AddUndoAction=2560(int token, int flags)
 
 # Start notifying the container of all key presses and commands.
 fun void StartRecord=3001(,)
-- 
cgit v1.2.3