# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1570566604 -7200
# Node ID f254dd2bc1074b48da7cc5616900e7fe6d636161
# Parent  7392f162e56ca976f2238e51cad6fedce7b48c6c
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)

diff --git a/src/evalwindow.c b/src/evalwindow.c
--- 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;
     }
 }
 
diff --git a/src/testdir/test_execute_func.vim b/src/testdir/test_execute_func.vim
--- 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
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2124,
+/**/
     2123,
 /**/
     2122,