From ff2941bf96e00eec62d51bc0d80679c5d3b356f6 Mon Sep 17 00:00:00 2001
From: johnsonj <unknown>
Date: Thu, 10 Sep 2015 13:52:09 +1000
Subject: Fix IME caret movements for emoji.

---
 win32/ScintillaWin.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'win32')

diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 7dd7d410b..f5d675f75 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1031,7 +1031,7 @@ sptr_t ScintillaWin::HandleCompositionInline(uptr_t, sptr_t lParam) {
 
 			// Record compstr character positions for moving IME carets.
 			numBytes += oneCharLen;
-			imeCharPos[i + 1] = numBytes;
+			imeCharPos[i + ucWidth] = numBytes;
 
 			// Draw an indicator on the character.
 			int indicator = SC_INDICATOR_UNKNOWN;
-- 
cgit v1.2.3