aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1992: the search stat moves when wrapping at the end of the buffer

Browse Source 
Problem:    The search stat moves when wrapping at the end of the buffer.
Solution:   Put the "W" in front instead of at the end.
This commit is contained in:
Bram Moolenaar 2019-09-06 20:40:21 +02:00
parent 6f72e90dd8
commit 16b58ae9f3
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/search.c
View File

@ -5011,7 +5011,9 @@ search_stat(
len = STRLEN(t);
if (show_top_bot_msg && len + 2 < SEARCH_STAT_BUF_LEN)
{
STRCPY(t + len, " W");
mch_memmove(t + 2, t, len);
t[0] = 'W';
t[1] = ' ';
len += 2;
}

10
src/testdir/test_search_stat.vim
View File

@ -43,7 +43,7 @@ func Test_search_stat()
call assert_match(pat .. stat, g:a)
call cursor(line('$'), 1)
let g:a = execute(':unsilent :norm! n')
let stat = '\[1/>99\] W'
let stat = 'W \[1/>99\]'
call assert_match(pat .. stat, g:a)
" Many matches
@ -53,7 +53,7 @@ func Test_search_stat()
call assert_match(pat .. stat, g:a)
call cursor(1, 1)
let g:a = execute(':unsilent :norm! N')
let stat = '\[>99/>99\] W'
let stat = 'W \[>99/>99\]'
call assert_match(pat .. stat, g:a)
" right-left
@ -85,7 +85,7 @@ func Test_search_stat()
call cursor('$',1)
let pat = 'raboof/\s\+'
let g:a = execute(':unsilent :norm! n')
let stat = '\[20/1\]'
let stat = 'W \[20/1\]'
call assert_match(pat .. stat, g:a)
call assert_match('search hit BOTTOM, continuing at TOP', g:a)
set norl
@ -96,10 +96,10 @@ func Test_search_stat()
let @/ = 'foobar'
let pat = '?foobar\s\+'
let g:a = execute(':unsilent :norm! N')
let stat = '\[20/20\]'
let stat = 'W \[20/20\]'
call assert_match(pat .. stat, g:a)
call assert_match('search hit TOP, continuing at BOTTOM', g:a)
call assert_match('\[20/20\] W', Screenline(&lines))
call assert_match('W \[20/20\]', Screenline(&lines))
" normal, no match
call cursor(1,1)

2
src/version.c
View File

@ -757,6 +757,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1992,
/**/
1991,
/**/