Mercurial > vim
changeset 18259:f254dd2bc107 v8.1.2124
patch 8.1.2124: ruler is not updated if win_execute() moves cursor
Commit: https://github.com/vim/vim/commit/345f28df5482cd35f5fa74b06443376379f113b0
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Oct 8 22:20:35 2019 +0200
patch 8.1.2124: ruler is not updated if win_execute() moves cursor
Problem: Ruler is not updated if win_execute() moves cursor.
Solution: Update the status line. (closes https://github.com/vim/vim/issues/5022)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Tue, 08 Oct 2019 22:30:04 +0200 |
parents | 7392f162e56c |
children | 395b4d97da2a |
files | src/evalwindow.c src/testdir/test_execute_func.vim src/version.c |
diffstat | 3 files changed, 28 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalwindow.c +++ b/src/evalwindow.c @@ -655,12 +655,18 @@ f_win_execute(typval_T *argvars, typval_ if (wp != NULL && tp != NULL) { + pos_T curpos = wp->w_cursor; + if (switch_win_noblock(&save_curwin, &save_curtab, wp, tp, TRUE) == OK) { check_cursor(); execute_common(argvars, rettv, 1); } restore_win_noblock(save_curwin, save_curtab, TRUE); + + // Update the status line if the cursor moved. + if (win_valid(wp) && !EQUAL_POS(curpos, wp->w_cursor)) + wp->w_redr_status = TRUE; } }
--- a/src/testdir/test_execute_func.vim +++ b/src/testdir/test_execute_func.vim @@ -1,5 +1,7 @@ " test execute() +source view_util.vim + func NestedEval() let nested = execute('echo "nested\nlines"') echo 'got: "' . nested . '"' @@ -101,6 +103,24 @@ func Test_win_execute() bwipe! endfunc +func Test_win_execute_update_ruler() + enew + call setline(1, range(500)) + 20 + split + let winid = win_getid() + set ruler + wincmd w + let height = winheight(winid) + redraw + call assert_match('20,1', Screenline(height + 1)) + let line = win_execute(winid, 'call cursor(100, 1)') + redraw + call assert_match('100,1', Screenline(height + 1)) + + bwipe! +endfunc + func Test_win_execute_other_tab() let thiswin = win_getid() tabnew