updated for version 7.2-152

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 38acbfeba9ebde5faa3d9de7b764191a4cc54f4d..057e7d6c300df534350028456b2ac355258b0e44 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2699,6 +2699,11 @@ doend:
        /* Restore msg_scroll, it's set by file I/O commands, even when no
         * message is actually displayed. */
        msg_scroll = save_msg_scroll;
+
+       /* "silent reg" or "silent echo x" inside "redir" leaves msg_col
+        * somewhere in the line.  Put it back in the first column. */
+       if (redirecting())
+           msg_col = 0;
     }
 
 #ifdef HAVE_SANDBOX

diff --git a/src/message.c b/src/message.c
index ffa45a1999471b5214b1d17a85871434ded1fe0b..6e00c1a785f8ba1c06cb4d04444f2f2b360f3119 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -3023,11 +3023,7 @@ redir_write(str, maxlen)
     if (*p_vfile != NUL)
        verbose_write(s, maxlen);
 
-    if (redir_fd != NULL
-#ifdef FEAT_EVAL
-                         || redir_reg || redir_vname
-#endif
-                                      )
+    if (redirecting())
     {
        /* If the string doesn't start with CR or NL, go to msg_col */
        if (*s != '\n' && *s != '\r')
@@ -3074,6 +3070,16 @@ redir_write(str, maxlen)
     }
 }
 
+    int
+redirecting()
+{
+    return redir_fd != NULL
+#ifdef FEAT_EVAL
+                         || redir_reg || redir_vname
+#endif
+                                      ;
+}
+
 /*
  * Before giving verbose message.
  * Must always be called paired with verbose_leave()!

diff --git a/src/proto/message.pro b/src/proto/message.pro
index cff7d6b505d58e185c75837844d53cd4211117a6..09b9152b755b11159634b7cda2028becf1a6bfb3 100644 (file)
--- a/src/proto/message.pro
+++ b/src/proto/message.pro
@@ -54,6 +54,7 @@ void msg_clr_eos_force __ARGS((void));
 void msg_clr_cmdline __ARGS((void));
 int msg_end __ARGS((void));
 void msg_check __ARGS((void));
+int redirecting __ARGS((void));
 void verbose_enter __ARGS((void));
 void verbose_leave __ARGS((void));
 void verbose_enter_scroll __ARGS((void));

diff --git a/src/version.c b/src/version.c
index afb3650e1cdcb554621148ba8a651ada59014f4b..45825767d39479a07032ce59aa054f19b5aeaa4e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    152,
 /**/
     151,
 /**/