patch 7.4.2005

Problem:    After using evalcmd() message output is in the wrong position.
            (Christian Brabandt)
Solution:   Reset msg_col.

diff --git a/src/eval.c b/src/eval.c
index a51225d56c826df07353be243e51c695a69267a1..4764f49ab80e32682e3ffe3777dcfcb262f3b822 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -11397,6 +11397,10 @@ f_evalcmd(typval_T *argvars, typval_T *rettv)
        redir_evalcmd = save_redir_evalcmd;
        if (redir_evalcmd)
            redir_evalcmd_ga = save_ga;
+
+       /* "silent reg" or "silent echo x" leaves msg_col somewhere in the
+        * line.  Put it back in the first column. */
+       msg_col = 0;
     }
 }
 

diff --git a/src/version.c b/src/version.c
index 3429bf015eee2e3863cf70c3ed852b946fd5eefa..a326ecb80f66da3f298e5bf21f429be60e358580 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 */
+/**/
+    2005,
 /**/
     2004,
 /**/