patch 8.1.0571: non-silent execute() resets display column to zero
Problem: Non-silent execute() resets display column to zero.
Solution: Keep the display column as-is.
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 51e0699..d3b2da7 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -3263,6 +3263,7 @@
int save_redir_off = redir_off;
garray_T save_ga;
int save_msg_col = msg_col;
+ int echo_output = FALSE;
rettv->vval.v_string = NULL;
rettv->v_type = VAR_STRING;
@@ -3289,6 +3290,8 @@
if (s == NULL)
return;
+ if (*s == NUL)
+ echo_output = TRUE;
if (STRNCMP(s, "silent", 6) == 0)
++msg_silent;
if (STRCMP(s, "silent!") == 0)
@@ -3305,7 +3308,8 @@
ga_init2(&redir_execute_ga, (int)sizeof(char), 500);
redir_execute = TRUE;
redir_off = FALSE;
- msg_col = 0; // prevent leading spaces
+ if (!echo_output)
+ msg_col = 0; // prevent leading spaces
if (cmd != NULL)
do_cmdline_cmd(cmd);
@@ -3339,8 +3343,14 @@
redir_off = save_redir_off;
// "silent reg" or "silent echo x" leaves msg_col somewhere in the line.
- // Put it back where it was, since nothing should have been written.
- msg_col = save_msg_col;
+ if (echo_output)
+ // When not working silently: put it in column zero. A following
+ // "echon" will overwrite the message, unavoidably.
+ msg_col = 0;
+ else
+ // When working silently: Put it back where it was, since nothing
+ // should have been written.
+ msg_col = save_msg_col;
}
/*