From 9e33c1e088ca959a55cd040845a6f6dafbac3cb2 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Fri, 21 May 2010 23:53:50 +0000
Subject: EOL conversion for drop. Fixes bug #3005328.

---
 win32/ScintillaWin.cxx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 59df887f5..5fb6e5286 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -2377,6 +2377,16 @@ STDMETHODIMP ScintillaWin::Drop(LPDATAOBJECT pIDataSource, DWORD grfKeyState,
 			}
 		}
 
+		if (data && convertPastes) {
+			// Convert line endings of the drop into our local line-endings mode
+			int len = strlen(data);
+			char *convertedText = Document::TransformLineEnds(&len, data, len, pdoc->eolMode);
+			if (dataAllocated)
+				delete []data;
+			data = convertedText;
+			dataAllocated = true;
+		}
+
 		if (!data) {
 			//Platform::DebugPrintf("Bad data format: 0x%x\n", hres);
 			return hr;
-- 
cgit v1.2.3