diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-07-08 10:53:12 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-07-08 10:53:12 +0200 |
commit | 245a7cb6d33e556415c9fcaa874b784a6d8f0ef3 (patch) | |
tree | 2b4c5a0bce74435d7eba29d0b740a858943a112b /src | |
parent | bc5d6dd1dd1dc3a06e4e655fc9479529db288365 (diff) |
patch 7.4.2000v7.4.2000
Problem: Evalcmd test fails.
Solution: Add missing piece.
Diffstat (limited to 'src')
-rw-r--r-- | src/ex_docmd.c | 6 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 0be3a69102..0388de8da4 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -9455,6 +9455,12 @@ ex_redir(exarg_T *eap) char_u *fname; char_u *arg = eap->arg; + if (redir_evalcmd) + { + EMSG(_("E930: Cannot use :redir inside evalcmd()")); + return; + } + if (STRICMP(eap->arg, "END") == 0) close_redir(); else diff --git a/src/version.c b/src/version.c index 5794e3a2fe..6224e3dce7 100644 --- a/src/version.c +++ b/src/version.c @@ -759,6 +759,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2000, +/**/ 1999, /**/ 1998, |