mirror of
https://github.com/vim/vim.git
synced 2025-09-25 03:54:15 -04:00
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 #5022)
This commit is contained in:
@@ -655,12 +655,18 @@ f_win_execute(typval_T *argvars, typval_T *rettv)
|
|||||||
|
|
||||||
if (wp != NULL && tp != NULL)
|
if (wp != NULL && tp != NULL)
|
||||||
{
|
{
|
||||||
|
pos_T curpos = wp->w_cursor;
|
||||||
|
|
||||||
if (switch_win_noblock(&save_curwin, &save_curtab, wp, tp, TRUE) == OK)
|
if (switch_win_noblock(&save_curwin, &save_curtab, wp, tp, TRUE) == OK)
|
||||||
{
|
{
|
||||||
check_cursor();
|
check_cursor();
|
||||||
execute_common(argvars, rettv, 1);
|
execute_common(argvars, rettv, 1);
|
||||||
}
|
}
|
||||||
restore_win_noblock(save_curwin, save_curtab, TRUE);
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,5 +1,7 @@
|
|||||||
" test execute()
|
" test execute()
|
||||||
|
|
||||||
|
source view_util.vim
|
||||||
|
|
||||||
func NestedEval()
|
func NestedEval()
|
||||||
let nested = execute('echo "nested\nlines"')
|
let nested = execute('echo "nested\nlines"')
|
||||||
echo 'got: "' . nested . '"'
|
echo 'got: "' . nested . '"'
|
||||||
@@ -101,6 +103,24 @@ func Test_win_execute()
|
|||||||
bwipe!
|
bwipe!
|
||||||
endfunc
|
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()
|
func Test_win_execute_other_tab()
|
||||||
let thiswin = win_getid()
|
let thiswin = win_getid()
|
||||||
tabnew
|
tabnew
|
||||||
|
@@ -753,6 +753,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
2124,
|
||||||
/**/
|
/**/
|
||||||
2123,
|
2123,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user