summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-12-11 18:36:33 +0100
committerBram Moolenaar <bram@vim.org>2013-12-11 18:36:33 +0100
commita09de4f2369365e6a05a6bbb2919a6646bf4bb87 (patch)
tree26da27c108aef9cf457242c54d8a21c8f8092502
parenta9eac1a136d614f8d8fded38a5da48b33f216a42 (diff)
downloadvim-a09de4f2369365e6a05a6bbb2919a6646bf4bb87.tar.gz
updated for version 7.4.125v7.4.125v7-4-125
Problem: Win32: Dealing with messages may not work for multi-byte chars. Solution: Use pDispatchMessage(). (Ken Takata)
-rw-r--r--src/os_win32.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/os_win32.c b/src/os_win32.c
index 17df345f..182c88c6 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -4282,10 +4282,10 @@ mch_system_piped(char *cmd, int options)
{
MSG msg;
- if (PeekMessage(&msg, (HWND)NULL, 0, 0, PM_REMOVE))
+ if (pPeekMessage(&msg, (HWND)NULL, 0, 0, PM_REMOVE))
{
TranslateMessage(&msg);
- DispatchMessage(&msg);
+ pDispatchMessage(&msg);
}
/* write pipe information in the window */
diff --git a/src/version.c b/src/version.c
index f4696d78..d4cc3d73 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 125,
+/**/
124,
/**/
123,