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.
---
 win32/ScintillaWin.cxx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'win32')

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