1 files changed, 21 insertions, 4 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 4256bb817..8453118b3 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -7690,16 +7690,33 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		InvalidateStyleRedraw();
 		break;
 
-	case SCI_MULTIEDGEADDLINE:
-		vs.theMultiEdge.push_back(EdgeProperties(wParam, lParam));
-		InvalidateStyleRedraw();
-		break;
+	case SCI_MULTIEDGEADDLINE: {
+			// Insert new edge in sorted order.
+			const int column = static_cast<int>(wParam);
+			vs.theMultiEdge.insert(
+				std::upper_bound(vs.theMultiEdge.begin(), vs.theMultiEdge.end(), column,
+					[](const EdgeProperties &a, const EdgeProperties &b) {
+						return a.column < b.column;
+					}),
+				EdgeProperties(wParam, lParam));
+			InvalidateStyleRedraw();
+			break;
+		}
 
 	case SCI_MULTIEDGECLEARALL:
 		std::vector<EdgeProperties>().swap(vs.theMultiEdge); // Free vector and memory, C++03 compatible
 		InvalidateStyleRedraw();
 		break;
 
+	case SCI_GETMULTIEDGECOLUMN: {
+			const size_t which = wParam;
+			// size_t is unsigned so this also handles negative inputs.
+			if (which >= vs.theMultiEdge.size()) {
+				return -1;
+			}
+			return vs.theMultiEdge[which].column;
+		}
+
 	case SCI_GETACCESSIBILITY:
 		return SC_ACCESSIBILITY_DISABLED;