mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.1.1970: search stat space wrong, no test for 8.1.1965
Problem: Search stat space wrong, no test for 8.1.1965. Solution: Fix check for cmd_silent. Add a test. (Christian Brabandt)
This commit is contained in:
parent
581ba39aef
commit
19e8ac72e9
@ -1391,7 +1391,7 @@ do_search(
|
||||
// search stat. Use all the space available, so that the
|
||||
// search state is right aligned. If there is not enough space
|
||||
// msg_strtrunc() will shorten in the middle.
|
||||
if (msg_scrolled != 0 || cmd_silent)
|
||||
if (msg_scrolled != 0 && !cmd_silent)
|
||||
// Use all the columns.
|
||||
len = (int)(Rows - msg_row) * Columns - 1;
|
||||
else
|
||||
|
@ -160,7 +160,28 @@ func! Test_search_stat()
|
||||
let stat = '\[1/2\]'
|
||||
call assert_notmatch(pat .. stat, g:a)
|
||||
|
||||
" close the window
|
||||
" normal, n comes from a silent mapping
|
||||
" First test a normal mapping, then a silent mapping
|
||||
call cursor(1,1)
|
||||
nnoremap n n
|
||||
let @/ = 'find this'
|
||||
let pat = '/find this\s\+'
|
||||
let g:a = execute(':unsilent :norm n')
|
||||
let g:b = split(g:a, "\n")[-1]
|
||||
let stat = '\[1/2\]'
|
||||
call assert_match(pat .. stat, g:b)
|
||||
nnoremap <silent> n n
|
||||
call cursor(1,1)
|
||||
let g:a = execute(':unsilent :norm n')
|
||||
let g:b = split(g:a, "\n")[-1]
|
||||
let stat = '\[1/2\]'
|
||||
call assert_notmatch(pat .. stat, g:b)
|
||||
call assert_match(stat, g:b)
|
||||
unmap n
|
||||
|
||||
" Clean up
|
||||
set shortmess+=S
|
||||
|
||||
" close the window
|
||||
bwipe!
|
||||
endfunc
|
||||
|
@ -761,6 +761,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1970,
|
||||
/**/
|
||||
1969,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user