diff --git a/src/os_unix.c b/src/os_unix.c index af3c700db7..e0bc3de218 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4588,7 +4588,6 @@ mch_call_shell_fork( char_u *tofree1 = NULL; char_u *tofree2 = NULL; int i; - char_u *p; int pty_master_fd = -1; /* for pty's */ # ifdef FEAT_GUI int pty_slave_fd = -1; @@ -5174,6 +5173,7 @@ mch_call_shell_fork( else if (has_mbyte) { int l; + char_u *p; len += buffer_off; buffer[len] = NUL; diff --git a/src/version.c b/src/version.c index a5883446ca..b5c613712a 100644 --- a/src/version.c +++ b/src/version.c @@ -766,6 +766,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1613, /**/ 1612, /**/