diff options
| author | Albert | 2020-04-13 22:52:30 +0800 |
|---|---|---|
| committer | Eli Zaretskii | 2020-04-13 18:31:35 +0300 |
| commit | 9c6392c35891a869a08c25d4195c395fd49af82a (patch) | |
| tree | 23b2670cb47a6c065dc2f2ddeadc730446428d08 /src | |
| parent | fc336a46553919206d9ac621d1ea5e9740477e18 (diff) | |
| download | emacs-9c6392c35891a869a08c25d4195c395fd49af82a.tar.gz emacs-9c6392c35891a869a08c25d4195c395fd49af82a.zip | |
Fix previous change in w32fns.c
* src/w32fns.c (w32_msg_pump): Simplify by not calling
ImmGetOpenStatus.
(Fw32_get_ime_open_status): Fix a typo.
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32fns.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index dddf3dc5719..4f7cbed249d 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -3459,10 +3459,7 @@ w32_msg_pump (deferred_msg * msg_buf) | |||
| 3459 | if (!context) | 3459 | if (!context) |
| 3460 | break; | 3460 | break; |
| 3461 | 3461 | ||
| 3462 | BOOL new_status = (msg.wParam != 0); | 3462 | set_ime_open_status_fn (context, msg.wParam != 0); |
| 3463 | BOOL ime_status = get_ime_open_status_fn (context); | ||
| 3464 | if (new_status != ime_status) | ||
| 3465 | set_ime_open_status_fn (context, new_status); | ||
| 3466 | release_ime_context_fn (focus_window, context); | 3463 | release_ime_context_fn (focus_window, context); |
| 3467 | break; | 3464 | break; |
| 3468 | } | 3465 | } |
| @@ -10261,7 +10258,7 @@ This function returns non-nil if the IME is active, otherwise nil. */) | |||
| 10261 | { | 10258 | { |
| 10262 | HWND current_window = FRAME_W32_WINDOW (sf); | 10259 | HWND current_window = FRAME_W32_WINDOW (sf); |
| 10263 | HIMC context = get_ime_context_fn (current_window); | 10260 | HIMC context = get_ime_context_fn (current_window); |
| 10264 | if (!context) | 10261 | if (context) |
| 10265 | { | 10262 | { |
| 10266 | BOOL retval = get_ime_open_status_fn (context); | 10263 | BOOL retval = get_ime_open_status_fn (context); |
| 10267 | release_ime_context_fn (current_window, context); | 10264 | release_ime_context_fn (current_window, context); |