changeset 16696:b1756c303066 v8.1.1350

patch 8.1.1350: "W" for wrapping not shown when more than 99 matches commit https://github.com/vim/vim/commit/dc6855af974f2ef553aceee619fadcb858e25d39 Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 18 19:26:29 2019 +0200 patch 8.1.1350: "W" for wrapping not shown when more than 99 matches Problem: "W" for wrapping not shown when more than 99 matches. Solution: Adjust check for length. (Masato Nishihata, closes https://github.com/vim/vim/issues/4388)
author Bram Moolenaar <Bram@vim.org>
date Sat, 18 May 2019 19:30:10 +0200
parents bb8d2ba5f265
children 8356f693c812
files src/search.c src/testdir/test_search_stat.vim src/version.c
diffstat 3 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/search.c
+++ b/src/search.c
@@ -5012,7 +5012,7 @@ search_stat(
 	}
 
 	len = STRLEN(t);
-	if (show_top_bot_msg && len + 3 < SEARCH_STAT_BUF_LEN)
+	if (show_top_bot_msg && len + 2 < SEARCH_STAT_BUF_LEN)
 	{
 	    STRCPY(t + len, " W");
 	    len += 2;
--- a/src/testdir/test_search_stat.vim
+++ b/src/testdir/test_search_stat.vim
@@ -40,12 +40,20 @@ func! Test_search_stat()
   let g:a = execute(':unsilent :norm! n')
   let stat = '\[>99/>99\]'
   call assert_match(pat .. stat, g:a)
+  call cursor(line('$'), 1)
+  let g:a = execute(':unsilent :norm! n')
+  let stat = '\[1/>99\] W'
+  call assert_match(pat .. stat, g:a)
 
   " 5) Many matches
   call cursor(1, 1)
   let g:a = execute(':unsilent :norm! n')
   let stat = '\[2/>99\]'
   call assert_match(pat .. stat, g:a)
+  call cursor(1, 1)
+  let g:a = execute(':unsilent :norm! N')
+  let stat = '\[>99/>99\] W'
+  call assert_match(pat .. stat, g:a)
 
   " 6) right-left
   if exists("+rightleft")
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1350,
+/**/
     1349,
 /**/
     1348,