summaryrefslogtreecommitdiffstats
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
commit175d0704dfb1247be7f414bfbcf9f5cfeced2794 (patch)
tree50878b6711c2be6ea191216201143bcc9d2e1af3
parent2cc8738f2f87ffa3e584b8e606f11fbb188c46b4 (diff)
updated for version 7.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 17df345f23..182c88c6ed 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 f4696d78e6..d4cc3d73dc 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,