patch 8.2.2686: status line is not updated when going to cmdline mode

Problem:    Status line is not updated when going to cmdline mode.
Solution:   Redraw status lines if 'statusline' is set and going to status
            line mode. (based on patch from Justin M. Keyes et al.,
            closes #8044)

diff --git a/src/ex_getln.c b/src/ex_getln.c
index 2be8156eaa5ddf7f8adaefebf7f5a7a040708dc1..58cd6c35805dac04a49cb53efde508d6efcb135a 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1706,6 +1706,15 @@ getcmdline_int(
     // and execute commands. Display may be messed up a bit.
     if (did_emsg)
        redrawcmd();
+
+    // Redraw the statusline in case it uses the current mode using the mode()
+    // function.
+    if (!cmd_silent && msg_scrolled == 0 && *p_stl != NUL)
+    {
+       curwin->w_redr_status = TRUE;
+       redraw_statuslines();
+    }
+
     did_emsg = FALSE;
     got_int = FALSE;
 

diff --git a/src/testdir/dumps/Test_statusline_mode_1.dump b/src/testdir/dumps/Test_statusline_mode_1.dump
new file mode 100644 (file)
index 0000000..476fb73
--- /dev/null
+++ b/src/testdir/dumps/Test_statusline_mode_1.dump
@@ -0,0 +1,5 @@
+> +0&#ffffff0@49
+|~+0#4040ff13&| @48
+|~| @48
+|-+3#0000000&|n|-| @46
+| +0&&@49

diff --git a/src/testdir/dumps/Test_statusline_mode_2.dump b/src/testdir/dumps/Test_statusline_mode_2.dump
new file mode 100644 (file)
index 0000000..e4fe764
--- /dev/null
+++ b/src/testdir/dumps/Test_statusline_mode_2.dump
@@ -0,0 +1,5 @@
+| +0&#ffffff0@49
+|~+0#4040ff13&| @48
+|~| @48
+|-+3#0000000&|c|-| @46
+|:+0&&> @48

diff --git a/src/testdir/test_statusline.vim b/src/testdir/test_statusline.vim
index f6c05f661bf3b168aae0ed6e6e891a21fa792d90..bbf7ddf1940febb42a86bd423452fdbba26e81bb 100644 (file)
--- a/src/testdir/test_statusline.vim
+++ b/src/testdir/test_statusline.vim
@@ -448,6 +448,27 @@ func Test_statusline_removed_group()
   call delete('XTest_statusline')
 endfunc
 
+func Test_statusline_using_mode()
+  CheckScreendump
+
+  let lines =<< trim END
+    set laststatus=2
+    let &statusline = '-%{mode()}-'
+  END
+  call writefile(lines, 'XTest_statusline')
+
+  let buf = RunVimInTerminal('-S XTest_statusline', {'rows': 5, 'cols': 50})
+  call VerifyScreenDump(buf, 'Test_statusline_mode_1', {})
+
+  call term_sendkeys(buf, ":")
+  call VerifyScreenDump(buf, 'Test_statusline_mode_2', {})
+
+  " clean up
+  call term_sendkeys(buf, "\<CR>")
+  call StopVimInTerminal(buf)
+  call delete('XTest_statusline')
+endfunc
+
 func Test_statusline_after_split_vsplit()
   only
 

diff --git a/src/version.c b/src/version.c
index 8a6e1642a68db588479ed1e4a9b1be159c64456d..68949e0e3cb5360e865c4050a48bf29f132d1b90 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2686,
 /**/
     2685,
 /**/