From 12c1a6d93c6fe3e93bcebcb23d8ac2e2fe92a5bd Mon Sep 17 00:00:00 2001
From: johnsonj <unknown>
Date: Fri, 11 Dec 2015 13:48:04 +1100
Subject: Korean input by word fixed.

---
 doc/ScintillaHistory.html | 3 +++
 gtk/ScintillaGTK.cxx      | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 03d41a19a..f44f66363 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -534,6 +534,9 @@
 	to the end of the cluster making it easier to understand editing actions.
 	</li>
 	<li>
+	On GTK+, Korean input by word fixed.
+	</li>
+	<li>
 	On GTK+ on OS X, fix warning during destruction.
 	<a href="http://sourceforge.net/p/scintilla/bugs/1777/">Bug #1777</a>.
 	</li>
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 0d8943826..19576ce9e 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -2518,12 +2518,11 @@ void ScintillaGTK::PreeditChangedInlineThis() {
 		recordingMacro = tmpRecordingMacro;
 
 		// Move caret to ime cursor position.
+		MoveImeCarets( - (imeCharPos[preeditStr.uniStrLen]) + imeCharPos[preeditStr.cursor_pos]);
+
 		if (KoreanIME()) {
+			MoveImeCarets( - imeCharPos[1]); // always 2 bytes for DBCS or 3 bytes for UTF8.
 			view.imeCaretBlockOverride = true;
-			MoveImeCarets( - (imeCharPos[preeditStr.uniStrLen]));
-
-		} else {
-			MoveImeCarets( - (imeCharPos[preeditStr.uniStrLen]) + imeCharPos[preeditStr.cursor_pos]);
 		}
 
 		EnsureCaretVisible();
-- 
cgit v1.2.3