Mercurial > vim
diff src/gui_w32.c @ 18742:e9b2ade1adbd v8.1.2361
patch 8.1.2361: MS-Windows: test failures related to VIMDLL
Commit: https://github.com/vim/vim/commit/310c32e8920140f0db747c6c6eb06b1ee53cdb5a
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Nov 29 23:15:25 2019 +0100
patch 8.1.2361: MS-Windows: test failures related to VIMDLL
Problem: MS-Windows: test failures related to VIMDLL.
Solution: Adjust code and tests. (Ken Takata, closes https://github.com/vim/vim/issues/5283)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 29 Nov 2019 23:30:04 +0100 |
parents | 652ac5edf8d0 |
children | 49b78d6465e5 |
line wrap: on
line diff
--- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -5746,6 +5746,14 @@ im_set_active(int active) HIMC hImc; static HIMC hImcOld = (HIMC)0; +# ifdef VIMDLL + if (!gui.in_use && !gui.starting) + { + mbyte_im_set_active(active); + return; + } +# endif + if (pImmGetContext) /* if NULL imm32.dll wasn't loaded (yet) */ { if (p_imdisable) @@ -5815,6 +5823,11 @@ im_get_status(void) int status = 0; HIMC hImc; +# ifdef VIMDLL + if (!gui.in_use && !gui.starting) + return mbyte_im_get_status(); +# endif + if (pImmGetContext && (hImc = pImmGetContext(s_hwnd)) != (HIMC)0) { status = pImmGetOpenStatus(hImc) ? 1 : 0;