mirror of
https://github.com/vim/vim.git
synced 2025-09-29 04:34:16 -04:00
patch 8.1.0274: 'incsearch' triggers on ":source"
Problem: 'incsearch' triggers on ":source". Solution: Check for the whole command name.
This commit is contained in:
@@ -342,26 +342,6 @@ func Test_searchc()
|
||||
bw!
|
||||
endfunc
|
||||
|
||||
func Test_search_cmdline3()
|
||||
if !exists('+incsearch')
|
||||
return
|
||||
endif
|
||||
" need to disable char_avail,
|
||||
" so that expansion of commandline works
|
||||
call test_override("char_avail", 1)
|
||||
new
|
||||
call setline(1, [' 1', ' 2 the~e', ' 3 the theother'])
|
||||
set incsearch
|
||||
1
|
||||
" first match
|
||||
call feedkeys("/the\<c-l>\<cr>", 'tx')
|
||||
call assert_equal(' 2 the~e', getline('.'))
|
||||
" clean up
|
||||
set noincsearch
|
||||
call test_override("char_avail", 0)
|
||||
bw!
|
||||
endfunc
|
||||
|
||||
func Cmdline3_prep()
|
||||
" need to disable char_avail,
|
||||
" so that expansion of commandline works
|
||||
@@ -377,6 +357,19 @@ func Cmdline3_cleanup()
|
||||
bw!
|
||||
endfunc
|
||||
|
||||
func Test_search_cmdline3()
|
||||
if !exists('+incsearch')
|
||||
return
|
||||
endif
|
||||
call Cmdline3_prep()
|
||||
1
|
||||
" first match
|
||||
call feedkeys("/the\<c-l>\<cr>", 'tx')
|
||||
call assert_equal(' 2 the~e', getline('.'))
|
||||
|
||||
call Cmdline3_cleanup()
|
||||
endfunc
|
||||
|
||||
func Test_search_cmdline3s()
|
||||
if !exists('+incsearch')
|
||||
return
|
||||
@@ -385,6 +378,12 @@ func Test_search_cmdline3s()
|
||||
1
|
||||
call feedkeys(":%s/the\<c-l>/xxx\<cr>", 'tx')
|
||||
call assert_equal(' 2 xxxe', getline('.'))
|
||||
undo
|
||||
call feedkeys(":%subs/the\<c-l>/xxx\<cr>", 'tx')
|
||||
call assert_equal(' 2 xxxe', getline('.'))
|
||||
undo
|
||||
call feedkeys(":%substitute/the\<c-l>/xxx\<cr>", 'tx')
|
||||
call assert_equal(' 2 xxxe', getline('.'))
|
||||
|
||||
call Cmdline3_cleanup()
|
||||
endfunc
|
||||
@@ -397,6 +396,9 @@ func Test_search_cmdline3g()
|
||||
1
|
||||
call feedkeys(":g/the\<c-l>/d\<cr>", 'tx')
|
||||
call assert_equal(' 3 the theother', getline(2))
|
||||
undo
|
||||
call feedkeys(":global/the\<c-l>/d\<cr>", 'tx')
|
||||
call assert_equal(' 3 the theother', getline(2))
|
||||
|
||||
call Cmdline3_cleanup()
|
||||
endfunc
|
||||
@@ -410,6 +412,10 @@ func Test_search_cmdline3v()
|
||||
call feedkeys(":v/the\<c-l>/d\<cr>", 'tx')
|
||||
call assert_equal(1, line('$'))
|
||||
call assert_equal(' 2 the~e', getline(1))
|
||||
undo
|
||||
call feedkeys(":vglobal/the\<c-l>/d\<cr>", 'tx')
|
||||
call assert_equal(1, line('$'))
|
||||
call assert_equal(' 2 the~e', getline(1))
|
||||
|
||||
call Cmdline3_cleanup()
|
||||
endfunc
|
||||
@@ -518,7 +524,7 @@ func Test_search_cmdline7()
|
||||
" so that expansion of commandline works
|
||||
call test_override("char_avail", 1)
|
||||
new
|
||||
let @/='b'
|
||||
let @/ = 'b'
|
||||
call setline(1, [' bbvimb', ''])
|
||||
set incsearch
|
||||
" first match
|
||||
|
Reference in New Issue
Block a user