patch 7.4.2000

Problem:    Evalcmd test fails.
Solution:   Add missing piece.

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 0be3a69102177dc48e6353912b9f110d375b1e4d..0388de8da43f6cedf00372180882ab4a991dbf78 100644 (file)
--- 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 5794e3a2fee6d5caf29d933c36138f612ae7f08f..6224e3dce73e2492cfb957a51c73a616790d1507 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2000,
 /**/
     1999,
 /**/