aboutsummaryrefslogtreecommitdiffhomepage
path: root/cocoa/ScintillaView.mm
diff options
context:
space:
mode:
authornyamatongwe <unknown>2013-04-09 15:25:26 +1000
committernyamatongwe <unknown>2013-04-09 15:25:26 +1000
commit5a3c37478d29afff6d1e53f4c9c901be5bbadcbb (patch)
treed2acb3cb3a70a7df7a7b161c9ce1567f4f264b29 /cocoa/ScintillaView.mm
parent3c46538bb90f861844d1f4c7b09959da7465ee23 (diff)
parent553a78b81d0deeb96940a7486074364e75d50068 (diff)
downloadscintilla-mirror-5a3c37478d29afff6d1e53f4c9c901be5bbadcbb.tar.gz
Merged Cocoa composition fix.
Diffstat (limited to 'cocoa/ScintillaView.mm')
-rw-r--r--cocoa/ScintillaView.mm5
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;