IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0571: non-silent execute() resets display column to zero

Browse Source 
Problem:    Non-silent execute() resets display column to zero.
Solution:   Keep the display column as-is.
446e7a3cd3
This commit is contained in:
Jan Edmund Lazo 2018-12-09 08:33:11 -05:00 committed by Jan Edmund Lazo
parent 8de5d64169
commit 7443da6f6e
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/eval.c
View File

@ -8332,6 +8332,7 @@ static void f_execute(typval_T *argvars, typval_T *rettv, FunPtr fptr)
const bool save_redir_off = redir_off; const bool save_redir_off = redir_off;
garray_T *const save_capture_ga = capture_ga; garray_T *const save_capture_ga = capture_ga;
const int save_msg_col = msg_col; const int save_msg_col = msg_col;
bool echo_output = false;
if (check_secure()) { if (check_secure()) {
return; return;
@ -8344,6 +8345,9 @@ static void f_execute(typval_T *argvars, typval_T *rettv, FunPtr fptr)
if (s == NULL) { if (s == NULL) {
return; return;
} }
if (*s == NUL) {
echo_output = true;
}
if (strncmp(s, "silent", 6) == 0) { if (strncmp(s, "silent", 6) == 0) {
msg_silent++; msg_silent++;
} }
@ -8359,7 +8363,9 @@ static void f_execute(typval_T *argvars, typval_T *rettv, FunPtr fptr)
ga_init(&capture_local, (int)sizeof(char), 80); ga_init(&capture_local, (int)sizeof(char), 80);
capture_ga = &capture_local; capture_ga = &capture_local;
redir_off = false; redir_off = false;
msg_col = 0; // prevent leading spaces if (!echo_output) {
msg_col = 0; // prevent leading spaces
}
if (argvars[0].v_type != VAR_LIST) { if (argvars[0].v_type != VAR_LIST) {
do_cmdline_cmd(tv_get_string(&argvars[0])); do_cmdline_cmd(tv_get_string(&argvars[0]));
@ -8379,8 +8385,15 @@ static void f_execute(typval_T *argvars, typval_T *rettv, FunPtr fptr)
emsg_noredir = save_emsg_noredir; emsg_noredir = save_emsg_noredir;
redir_off = save_redir_off; redir_off = save_redir_off;
// "silent reg" or "silent echo x" leaves msg_col somewhere in the line. // "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. if (echo_output) {
msg_col = save_msg_col; // 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;
}
ga_append(capture_ga, NUL); ga_append(capture_ga, NUL);
rettv->v_type = VAR_STRING; rettv->v_type = VAR_STRING;

17
src/nvim/testdir/test_execute_func.vim
View File

@ -65,3 +65,20 @@ func Test_execute_does_not_change_col()
endfor endfor
call assert_equal('abcdxyz', text) call assert_equal('abcdxyz', text)
endfunc endfunc
func Test_execute_not_silent()
echo ''
echon 'abcd'
let x = execute('echon 234', '')
echo 'xyz'
let text1 = ''
for col in range(1, 8)
let text1 .= nr2char(screenchar(&lines - 1, col))
endfor
call assert_equal('abcd234 ', text1)
let text2 = ''
for col in range(1, 4)
let text2 .= nr2char(screenchar(&lines, col))
endfor
call assert_equal('xyz ', text2)
endfunc