Backport: Feature [feature-requests:1344]. Add methods for iterating through the marker

handles and marker numbers on a line.

Backport of changeset 8129:665c31051e3c.

2 files changed, 10 insertions, 0 deletions

diff --git a/include/Scintilla.h b/include/Scintilla.h
index f688a9b7d..cea4983e3 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -63,6 +63,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_CANREDO 2016
 #define SCI_MARKERLINEFROMHANDLE 2017
 #define SCI_MARKERDELETEHANDLE 2018
+#define SCI_MARKERHANDLEFROMLINE 2732
+#define SCI_MARKERNUMBERFROMLINE 2733
 #define SCI_GETUNDOCOLLECTION 2019
 #define SCWS_INVISIBLE 0
 #define SCWS_VISIBLEALWAYS 1
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 7d0e9a880..ffc217d05 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -156,6 +156,12 @@ fun line MarkerLineFromHandle=2017(int markerHandle,)
 # Delete a marker.
 fun void MarkerDeleteHandle=2018(int markerHandle,)
 
+# Retrieve marker handles of a line
+fun int MarkerHandleFromLine=2732(line line, int which)
+
+# Retrieve marker number of a marker handle
+fun int MarkerNumberFromLine=2733(line line, int which)
+
 # Is undo history being collected?
 get bool GetUndoCollection=2019(,)
 
@@ -1242,6 +1248,8 @@ set void SetTargetEndVirtualSpace=2730(position space,)
 # Get the virtual space of the target end
 get position GetTargetEndVirtualSpace=2731(,)
 
+
+
 # Sets both the start and end of the target in one call.
 fun void SetTargetRange=2686(position start, position end)