diff options
| -rw-r--r-- | src/message.c | 2 | ||||
| -rw-r--r-- | src/os_mswin.c | 3 | ||||
| -rw-r--r-- | src/os_win32.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/src/message.c b/src/message.c index e548fc0c9..62e6bfe1e 100644 --- a/src/message.c +++ b/src/message.c @@ -2639,7 +2639,7 @@ msg_puts_printf(char_u *str, int maxlen) # if defined(FEAT_MBYTE) && !defined(FEAT_GUI_MSWIN) if (enc_codepage >= 0 && (int)GetConsoleCP() != enc_codepage) { - int inlen = STRLEN(str); + int inlen = (int)STRLEN(str); int outlen; WCHAR *widestr = (WCHAR *)enc_to_utf16(str, &inlen); diff --git a/src/os_mswin.c b/src/os_mswin.c index 374a2399c..815454955 100644 --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -453,8 +453,9 @@ slash_adjust(char_u *p) if (*p == '`') { + size_t len = STRLEN(p); + /* don't replace backslash in backtick quoted strings */ - int len = STRLEN(p); if (len > 2 && *(p + len - 1) == '`') return; } diff --git a/src/os_win32.c b/src/os_win32.c index 6c1a3dbde..2ee3f2e17 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -7031,7 +7031,8 @@ fix_arg_enc(void) * main.c, so this part add str as literal. */ if (literal == FALSE) { - int len = STRLEN(str); + size_t len = STRLEN(str); + if (len > 2 && *str == '`' && *(str + len - 1) == '`') literal = TRUE; } diff --git a/src/version.c b/src/version.c index 29703ed71..5a1660aa7 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 888, +/**/ 887, /**/ 886, |