From e99c07091ec1cebc855bcda42426286872d3a667 Mon Sep 17 00:00:00 2001
From: John Ehresman <unknown>
Date: Sat, 2 Mar 2024 16:58:47 +1100
Subject: Feature [feature-requests:#1511] Add mayCoalesce argument to
 BeginUndoAction.

---
 qt/ScintillaEdit/ScintillaDocument.cpp | 4 ++--
 qt/ScintillaEdit/ScintillaDocument.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'qt')

diff --git a/qt/ScintillaEdit/ScintillaDocument.cpp b/qt/ScintillaEdit/ScintillaDocument.cpp
index 977edc45f..b1091cec8 100644
--- a/qt/ScintillaEdit/ScintillaDocument.cpp
+++ b/qt/ScintillaEdit/ScintillaDocument.cpp
@@ -153,8 +153,8 @@ bool ScintillaDocument::is_collecting_undo() {
     return (static_cast<Document *>(pdoc))->IsCollectingUndo();
 }
 
-void ScintillaDocument::begin_undo_action() {
-    (static_cast<Document *>(pdoc))->BeginUndoAction();
+void ScintillaDocument::begin_undo_action(bool coalesceWithPrior) {
+    (static_cast<Document *>(pdoc))->BeginUndoAction(coalesceWithPrior);
 }
 
 void ScintillaDocument::end_undo_action() {
diff --git a/qt/ScintillaEdit/ScintillaDocument.h b/qt/ScintillaEdit/ScintillaDocument.h
index 8108fd2fa..fa129d53b 100644
--- a/qt/ScintillaEdit/ScintillaDocument.h
+++ b/qt/ScintillaEdit/ScintillaDocument.h
@@ -50,7 +50,7 @@ public:
     void delete_undo_history();
     bool set_undo_collection(bool collect_undo);
     bool is_collecting_undo();
-    void begin_undo_action();
+    void begin_undo_action(bool coalesceWithPrior = false);
     void end_undo_action();
     void set_save_point();
     bool is_save_point();
-- 
cgit v1.2.3