updated for version 7.0-098

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 3378092e6a9c09843f2f293f52f0888a361b114a..bb57a1068176f4f486a3ffdfec145c1202f525b3 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -8422,6 +8422,15 @@ ex_redir(eap)
        else
            EMSG2(_(e_invarg2), eap->arg);
     }
+
+    /* Make sure redirection is not off.  Can happen for cmdline completion
+     * that indirectly invokes a command to catch its output. */
+    if (redir_fd != NULL
+#ifdef FEAT_EVAL
+                         || redir_reg || redir_vname
+#endif
+                                                       )
+       redir_off = FALSE;
 }
 
 /*

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 617c246146ed5d52a770fb58ec6612310d4ec324..e006631396688428c2fff78ba2dbe7e8cc55bb8e 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -324,6 +324,9 @@ getcmdline(firstc, count, indent)
      */
     for (;;)
     {
+       redir_off = TRUE;       /* Don't redirect the typed command.
+                                  Repeated, because a ":redir" inside
+                                  completion may switch it on. */
 #ifdef USE_ON_FLY_SCROLL
        dont_scroll = FALSE;    /* allow scrolling here */
 #endif

diff --git a/src/version.c b/src/version.c
index 6cb788ca0c5c711f8cc2a4556c833f8b37937f26..acff8abd7ca1b046e3853a237db206b121d7e6db 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    98,
 /**/
     97,
 /**/