Fix problems with input composition that could stop undo working.

1 files changed, 5 insertions, 0 deletions

diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index f9496cac1..48ccdf1ef 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -401,6 +401,11 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor)
                          value: mMarkedTextRange.location + mMarkedTextRange.length];
     currentPosition = mMarkedTextRange.location;
   }
+  else
+  {
+    // Ensure only a single selection
+    mOwner.backend->SelectOnlyMainSelection();
+  }
 
   // Keep Scintilla from collecting undo actions for the composition task.
   undoCollectionWasActive = [mOwner getGeneralProperty: SCI_GETUNDOCOLLECTION] != 0;