aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32/ScintillaWin.cxx
diff options
context:
space:
mode:
authorZufu Liu <unknown>2019-11-16 07:53:52 +1100
committerZufu Liu <unknown>2019-11-16 07:53:52 +1100
commit04e1669d6e6271b76955dce95bb19cac46ffe417 (patch)
treea4925f5b9a2a8a095c2c11bf004296cc071cf113 /win32/ScintillaWin.cxx
parentfe7667b310bc4888bdc288635ff63cd6fac1c6d9 (diff)
downloadscintilla-mirror-04e1669d6e6271b76955dce95bb19cac46ffe417.tar.gz
Backport: Bug [#2137]. Clear IME state when switching language.
Backport of changeset 7763:9e086fbcc756.
Diffstat (limited to 'win32/ScintillaWin.cxx')
-rw-r--r--win32/ScintillaWin.cxx3
1 files changed, 3 insertions, 0 deletions
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();
}