diff options
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 10 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 8cd6be2a8..e5069cff7 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -931,15 +931,15 @@ void ScintillaCocoa::Paste(bool forceRectangular) pdoc->BeginUndoAction(); ClearSelection(false); int length = selectedText.Length(); + SelectionPosition selStart = sel.RangeMain().Start(); if (selectedText.rectangular) { - SelectionPosition selStart = sel.RangeMain().Start(); PasteRectangular(selStart, selectedText.Data(), length); } - else - if (pdoc->InsertString(sel.RangeMain().caret.Position(), selectedText.Data(), length)) - SetEmptySelection(sel.RangeMain().caret.Position() + length); - + else + { + InsertPaste(selStart, selectedText.Data(), length); + } pdoc->EndUndoAction(); Redraw(); diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index aaeae3572..436427d30 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -475,6 +475,10 @@ When scroll width is tracked, take width of annotation lines into account. </li> <li> + On Cocoa, multipaste mode now works. + <a href="http://sourceforge.net/p/scintilla/bugs/1541/">Bug #1541</a>. + </li> + <li> On Qt, bug fixed with finding monitor rectangle which could lead to autocomplete showing at wrong location. </li> <li> |