diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 9b4636955..02c8e8698 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -592,6 +592,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 e3bc4f711..6524ada5a 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(); } |