From ea862b3b81adc4bd2d04214607938318a7c62838 Mon Sep 17 00:00:00 2001
From: cshnik <cshnik@users.noreply.github.com>
Date: Tue, 2 Feb 2021 09:10:19 +1100
Subject: Bug [#2231]. Inconsistent behaviour in navigation on a line
 containing Japanese symbols #247

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

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 6a881c223..33e3c81fb 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -561,6 +561,8 @@
 	<td>uhf7</td>
 	<td>gnombat</td>
 	<td>Derek Brown</td>
+      </tr><tr>
+	<td>cshnik</td>
     </tr>
     </table>
     <p>
@@ -582,6 +584,10 @@
 	<li>
 	First version that separates Lexilla from Scintilla.
 	</li>
+	<li>
+	Fix Alt+End (move to wrapped line end) for Japanese UTF-8 text..
+	<a href="https://sourceforge.net/p/scintilla/bugs/2231/">Bug #2231</a>.
+	</li>
     </ul>
     <h3>
        <a href="https://www.scintilla.org/scite446.zip">Release 4.4.6</a>
diff --git a/src/EditView.cxx b/src/EditView.cxx
index 0bc950d69..e4acdec58 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -815,7 +815,7 @@ Sci::Position EditView::StartEndDisplayLine(Surface *surface, const EditModel &m
 						if (subLine == ll->lines - 1)
 							posRet = ll->numCharsBeforeEOL + posLineStart;
 						else
-							posRet = ll->LineStart(subLine + 1) + posLineStart - 1;
+							posRet = model.pdoc->MovePositionOutsideChar(ll->LineStart(subLine + 1) + posLineStart - 1, -1, false);
 					}
 				}
 			}
-- 
cgit v1.2.3