From: Bram Moolenaar Date: Fri, 2 Aug 2013 12:15:13 +0000 (+0200) Subject: updated for version 7.4b.005 X-Git-Tag: v7.4b.005 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=542805a59df19db785dc631f174a15eec40911af;p=vim updated for version 7.4b.005 Problem: Finding %s in shellpipe and shellredir does not ignore %%s. Solution: Skip over %%. (lcd 47) --- diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 66e170208..cc4cedf2e 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -1622,10 +1622,14 @@ append_redir(buf, buflen, opt, fname) char_u *end; end = buf + STRLEN(buf); - /* find "%s", skipping "%%" */ + /* find "%s" */ for (p = opt; (p = vim_strchr(p, '%')) != NULL; ++p) - if (p[1] == 's') + { + if (p[1] == 's') /* found %s */ break; + if (p[1] == '%') /* skip %% */ + ++p; + } if (p != NULL) { *end = ' '; /* not really needed? Not with sh, ksh or bash */ diff --git a/src/version.c b/src/version.c index 7ccb93153..ec2c2c000 100644 --- a/src/version.c +++ b/src/version.c @@ -727,6 +727,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 5, /**/ 4, /**/