aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32
diff options
context:
space:
mode:
authorjohnsonj <devnull@localhost>2015-12-14 15:03:51 +1100
committerjohnsonj <devnull@localhost>2015-12-14 15:03:51 +1100
commita2dd3d187967cd838747329dc37382796b01ad4f (patch)
treeb2acc097393603e33667266bb1b730ef1aa32528 /win32
parenteeb150883f74d5908872d71087814e73f4dd640e (diff)
downloadscintilla-mirror-a2dd3d187967cd838747329dc37382796b01ad4f.tar.gz
Block IME when some selected text is protected.
Diffstat (limited to 'win32')
-rw-r--r--win32/ScintillaWin.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index b97a39ff3..f536482a1 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1007,7 +1007,7 @@ sptr_t ScintillaWin::HandleCompositionInline(uptr_t, sptr_t lParam) {
IMContext imc(MainHWND());
if (!imc.hIMC)
return 0;
- if (pdoc->IsReadOnly()) {
+ if (pdoc->IsReadOnly() || SelectionContainsProtected()) {
::ImmNotifyIME(imc.hIMC, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
return 0;
}