From d56b12f17f91afc131a670a28c1e12ebb3028d70 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 9 Dec 2016 09:30:17 +1100
Subject: Warning suppression and documentation of previous change 6082.

---
 doc/ScintillaHistory.html | 4 ++++
 src/EditView.cxx          | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 47cf8e7b1..d8cdcc2f3 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -529,6 +529,10 @@
 	<a href="http://sourceforge.net/p/scintilla/bugs/1888/">Bug #1888</a>.
 	</li>
 	<li>
+	Use more precision to allow selecting individual lines in files with
+	more than 16.7 million lines.
+	</li>
+	<li>
 	For Qt 5, define QT_WS_MAC or QT_WS_X11 on those platforms.
 	<a href="http://sourceforge.net/p/scintilla/bugs/1887/">Bug #1887</a>.
 	</li>
diff --git a/src/EditView.cxx b/src/EditView.cxx
index b2855eb97..5c622568b 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -671,7 +671,8 @@ SelectionPosition EditView::SPositionFromLocation(Surface *surface, const EditMo
 			const XYPOSITION subLineStart = ll->positions[rangeSubLine.start];
 			if (subLine > 0)	// Wrapped
 				pt.x -= ll->wrapIndent;
-			const int positionInLine = ll->FindPositionFromX(pt.x + subLineStart, rangeSubLine, charPosition);
+			const int positionInLine = ll->FindPositionFromX(static_cast<XYPOSITION>(pt.x + subLineStart),
+				rangeSubLine, charPosition);
 			if (positionInLine < rangeSubLine.end) {
 				return SelectionPosition(model.pdoc->MovePositionOutsideChar(positionInLine + posLineStart, 1));
 			}
-- 
cgit v1.2.3