From 04e1669d6e6271b76955dce95bb19cac46ffe417 Mon Sep 17 00:00:00 2001
From: Zufu Liu <unknown>
Date: Sat, 16 Nov 2019 07:53:52 +1100
Subject: Backport: Bug [#2137]. Clear IME state when switching language.

Backport of changeset 7763:9e086fbcc756.
---
 doc/ScintillaHistory.html | 4 ++++
 win32/ScintillaWin.cxx    | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 63bc56b1d..87a0964fb 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -581,6 +581,10 @@
 	<a href="https://sourceforge.net/p/scintilla/feature-requests/1304/">Feature #1304</a>.
 	</li>
 	<li>
+	Clear IME state when switching language on Win32.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2137/">Bug #2137</a>.
+	</li>
+	<li>
 	Setting rectangular selection made faster.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2130/">Bug #2130</a>.
 	</li>
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index a04b03fa5..ef2782fe7 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -2743,6 +2743,9 @@ void ScintillaWin::ImeStartComposition() {
 
 /** Called when IME Window closed. */
 void ScintillaWin::ImeEndComposition() {
+	// clear IME composition state.
+	view.imeCaretBlockOverride = false;
+	pdoc->TentativeUndo();
 	ShowCaretAtCurrentPosition();
 }
 
-- 
cgit v1.2.3