From 22c9570a6c186fd14c5612f8ba4d3c828be86884 Mon Sep 17 00:00:00 2001
From: nyamatongwe <nyamatongwe@gmail.com>
Date: Fri, 25 Oct 2013 08:25:33 +1100
Subject: Bug [#1541]. Paste into multiple selections on OSX only inserts at
 one selection point.

---
 cocoa/ScintillaCocoa.mm   | 10 +++++-----
 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>
-- 
cgit v1.2.3