mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.1.1288: search stats don't show for mapped command
Problem: Search stats don't show for mapped command. Solution: Remove SEARCH_PEEK from searchit flags. Add a test. (Christian Brabandt)
This commit is contained in:
parent
7e1a5af540
commit
9ce3fa828d
@ -4958,8 +4958,8 @@ search_stat(
|
|||||||
profile_setlimit(20L, &start);
|
profile_setlimit(20L, &start);
|
||||||
#endif
|
#endif
|
||||||
while (!got_int && searchit(curwin, curbuf, &lastpos, NULL,
|
while (!got_int && searchit(curwin, curbuf, &lastpos, NULL,
|
||||||
FORWARD, NULL, 1, SEARCH_PEEK + SEARCH_KEEP,
|
FORWARD, NULL, 1, SEARCH_KEEP, RE_LAST,
|
||||||
RE_LAST, (linenr_T)0, NULL, NULL) != FAIL)
|
(linenr_T)0, NULL, NULL) != FAIL)
|
||||||
{
|
{
|
||||||
#ifdef FEAT_RELTIME
|
#ifdef FEAT_RELTIME
|
||||||
// Stop after passing the time limit.
|
// Stop after passing the time limit.
|
||||||
|
@ -8,6 +8,7 @@ source shared.vim
|
|||||||
func! Test_search_stat()
|
func! Test_search_stat()
|
||||||
new
|
new
|
||||||
set shortmess-=S
|
set shortmess-=S
|
||||||
|
" Append 50 lines with text to search for, "foobar" appears 20 times
|
||||||
call append(0, repeat(['foobar', 'foo', 'fooooobar', 'foba', 'foobar'], 10))
|
call append(0, repeat(['foobar', 'foo', 'fooooobar', 'foba', 'foobar'], 10))
|
||||||
|
|
||||||
" 1) match at second line
|
" 1) match at second line
|
||||||
@ -105,6 +106,30 @@ func! Test_search_stat()
|
|||||||
call assert_false(1)
|
call assert_false(1)
|
||||||
endtry
|
endtry
|
||||||
|
|
||||||
|
" 11) normal, n comes from a mapping
|
||||||
|
" Need to move over more than 64 lines to trigger char_avail(.
|
||||||
|
nnoremap n nzv
|
||||||
|
call cursor(1,1)
|
||||||
|
call append(50, repeat(['foobar', 'foo', 'fooooobar', 'foba', 'foobar'], 10))
|
||||||
|
call setline(2, 'find this')
|
||||||
|
call setline(70, 'find this')
|
||||||
|
let @/ = 'find this'
|
||||||
|
let pat = '/find this\s\+'
|
||||||
|
let g:a = execute(':unsilent :norm n')
|
||||||
|
" g:a will contain several lines
|
||||||
|
let g:b = split(g:a, "\n")[-1]
|
||||||
|
let stat = '\[1/2\]'
|
||||||
|
call assert_match(pat .. stat, g:b)
|
||||||
|
unmap n
|
||||||
|
|
||||||
|
" 11) normal, but silent
|
||||||
|
call cursor(1,1)
|
||||||
|
let @/ = 'find this'
|
||||||
|
let pat = '/find this\s\+'
|
||||||
|
let g:a = execute(':norm! n')
|
||||||
|
let stat = '\[1/2\]'
|
||||||
|
call assert_notmatch(pat .. stat, g:a)
|
||||||
|
|
||||||
" close the window
|
" close the window
|
||||||
set shortmess+=S
|
set shortmess+=S
|
||||||
bwipe!
|
bwipe!
|
||||||
|
@ -767,6 +767,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1288,
|
||||||
/**/
|
/**/
|
||||||
1287,
|
1287,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user