* w32fns.c (w32_wnd_proc) [WM_IME_STARTCOMPOSITION]: Position

IME window at cursor (Bug#2570).
(w32_wnd_proc) [WM_IME_CHAR]: Release context when finished.
(globals_of_w32fns): Dynamically load functions required above.

* w32term.c (w32_draw_window_cursor): Send message to reposition
any IME window.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/w32term.c b/src/w32term.c
index dde006bbdef..b7642b46891 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -32,6 +32,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <ctype.h>
 #include <errno.h>
 #include <sys/stat.h>
+#include <imm.h>
 
 #include "charset.h"
 #include "character.h"
@@ -5128,6 +5129,8 @@ w32_draw_window_cursor (w, glyph_row, x, y, cursor_type, cursor_width, on_p, act
             = (WINDOW_TO_FRAME_PIXEL_Y (w, w->phys_cursor.y)
                + glyph_row->ascent - w->phys_cursor_ascent);
 
+          PostMessage (hwnd, WM_IME_STARTCOMPOSITION, 0, 0);
+
           /* If the size of the active cursor changed, destroy the old
              system caret.  */
           if (w32_system_caret_hwnd