summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2011-06-13 01:19:56 +0200
committerBram Moolenaar <bram@vim.org>2011-06-13 01:19:56 +0200
commit4ec6e196a235170479ac18e02bcf9c9c5af52c23 (patch)
tree6eb91c009f7141885fa4e9516e6639e589810d03
parent7c229076a1bd6c48e125dd6df8fd83b63c02bbfb (diff)
downloadvim-4ec6e196a235170479ac18e02bcf9c9c5af52c23.tar.gz
updated for version 7.3.217v7.3.217v7-3-217
Problem: Inside an "if" a ":wincmd" causes problems. Solution: When skipping commands let ":wincmd" skip over its argument.
-rw-r--r--src/ex_docmd.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index b9ec6c53..602bbfab 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2595,6 +2595,7 @@ do_one_cmd(cmdlinep, sourcing,
case CMD_unlet:
case CMD_verbose:
case CMD_vertical:
+ case CMD_wincmd:
break;
default: goto doend;
@@ -8237,7 +8238,7 @@ ex_wincmd(eap)
p = skipwhite(p);
if (*p != NUL && *p != '"' && eap->nextcmd == NULL)
EMSG(_(e_invarg));
- else
+ else if (!eap->skip)
{
/* Pass flags on for ":vertical wincmd ]". */
postponed_split_flags = cmdmod.split;
diff --git a/src/version.c b/src/version.c
index 923380a4..f37599b7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 217,
+/**/
216,
/**/
215,