diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-05-18 19:26:29 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-05-18 19:26:29 +0200 |
commit | dc6855af974f2ef553aceee619fadcb858e25d39 (patch) | |
tree | 3e84fe2841d762bd7900383e074aae2841f1c296 | |
parent | cf0bfd9ade5173bcc12563bfc90c21a4db10535d (diff) | |
download | vim-git-dc6855af974f2ef553aceee619fadcb858e25d39.tar.gz |
patch 8.1.1350: "W" for wrapping not shown when more than 99 matchesv8.1.1350
Problem: "W" for wrapping not shown when more than 99 matches.
Solution: Adjust check for length. (Masato Nishihata, closes #4388)
-rw-r--r-- | src/search.c | 2 | ||||
-rw-r--r-- | src/testdir/test_search_stat.vim | 8 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/search.c b/src/search.c index d9b6a7ca8..56bd763dd 100644 --- 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; diff --git a/src/testdir/test_search_stat.vim b/src/testdir/test_search_stat.vim index 107cd54a0..322d137e2 100644 --- 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") diff --git a/src/version.c b/src/version.c index efddd3eaf..ac0793198 100644 --- 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, |