diff options
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/os_mswin.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c index c18672e4f..f691f506c 100644 --- a/src/option.c +++ b/src/option.c @@ -3181,7 +3181,7 @@ set_init_1() if (opt_idx >= 0) { #if !defined(HAVE_AVAIL_MEM) && !defined(HAVE_TOTAL_MEM) - if ((long)options[opt_idx].def_val[VI_DEFAULT] > n + if ((long)options[opt_idx].def_val[VI_DEFAULT] > (long)n || (long)options[opt_idx].def_val[VI_DEFAULT] == 0L) #endif options[opt_idx].def_val[VI_DEFAULT] = (char_u *)n; diff --git a/src/os_mswin.c b/src/os_mswin.c index 3b2ebe453..5af1dee51 100644 --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -1897,7 +1897,6 @@ Messaging_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) HWND sender = (HWND)wParam; COPYDATASTRUCT reply; char_u *res; - char_u winstr[30]; int retval; char_u *str; char_u *tofree; @@ -1970,6 +1969,8 @@ Messaging_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) #ifdef FEAT_AUTOCMD else if (data->dwData == COPYDATA_REPLY) { + char_u winstr[30]; + sprintf((char *)winstr, PRINTF_HEX_LONG_U, (long_u)sender); apply_autocmds(EVENT_REMOTEREPLY, winstr, str, TRUE, curbuf); diff --git a/src/version.c b/src/version.c index 3374e16f5..cc99dbc99 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1208, +/**/ 1207, /**/ 1206, |