diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-08-12 15:49:47 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-08-12 15:49:47 +0200 |
| commit | 976b847f43dd16eb6cd809d2dcab7dde6045e176 (patch) | |
| tree | af8ba8f8f6a9ff70bf4d23f2b84367c5e4c24881 | |
| parent | 21f990e1c22ffa2fdb66a548ebbe25e6e7194776 (diff) | |
| download | vim-git-976b847f43dd16eb6cd809d2dcab7dde6045e176.tar.gz | |
patch 8.1.0275: 'incsearch' with :s doesn't start at cursor linev8.1.0275
Problem: 'incsearch' with :s doesn't start at cursor line.
Solution: Set cursor before parsing address. (closes #3318)
Also accept a match at the start of the first line.
| -rw-r--r-- | src/ex_getln.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_search.vim | 31 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 31 insertions, 6 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 804013bb3..07032bb54 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -316,8 +316,8 @@ do_incsearch_highlighting(int firstc, incsearch_state_T *is_state, ea.line2 = 1; ea.cmd = ccline.cmdbuff; ea.addr_type = ADDR_LINES; - parse_cmd_address(&ea, &dummy); curwin->w_cursor = is_state->search_start; + parse_cmd_address(&ea, &dummy); if (ea.addr_count > 0) { search_first_line = ea.line1; @@ -401,6 +401,8 @@ may_do_incsearch_highlighting( #endif if (!p_hls) search_flags += SEARCH_KEEP; + if (search_first_line != 0) + search_flags += SEARCH_START; c = ccline.cmdbuff[skiplen + patlen]; ccline.cmdbuff[skiplen + patlen] = NUL; i = do_search(NULL, firstc == ':' ? '/' : firstc, diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim index 7e8ddbe64..ac5b228df 100644 --- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -351,7 +351,7 @@ func Cmdline3_prep() set incsearch endfunc -func Cmdline3_cleanup() +func Incsearch_cleanup() set noincsearch call test_override("char_avail", 0) bw! @@ -367,7 +367,7 @@ func Test_search_cmdline3() call feedkeys("/the\<c-l>\<cr>", 'tx') call assert_equal(' 2 the~e', getline('.')) - call Cmdline3_cleanup() + call Incsearch_cleanup() endfunc func Test_search_cmdline3s() @@ -385,7 +385,7 @@ func Test_search_cmdline3s() call feedkeys(":%substitute/the\<c-l>/xxx\<cr>", 'tx') call assert_equal(' 2 xxxe', getline('.')) - call Cmdline3_cleanup() + call Incsearch_cleanup() endfunc func Test_search_cmdline3g() @@ -400,7 +400,7 @@ func Test_search_cmdline3g() call feedkeys(":global/the\<c-l>/d\<cr>", 'tx') call assert_equal(' 3 the theother', getline(2)) - call Cmdline3_cleanup() + call Incsearch_cleanup() endfunc func Test_search_cmdline3v() @@ -417,7 +417,7 @@ func Test_search_cmdline3v() call assert_equal(1, line('$')) call assert_equal(' 2 the~e', getline(1)) - call Cmdline3_cleanup() + call Incsearch_cleanup() endfunc func Test_search_cmdline4() @@ -797,6 +797,27 @@ func Test_incsearch_scrolling() call delete('Xscript') endfunc +func Test_incsearch_substitute() + if !exists('+incsearch') + return + endif + call test_override("char_avail", 1) + new + set incsearch + for n in range(1, 10) + call setline(n, 'foo ' . n) + endfor + 4 + call feedkeys(":.,.+2s/foo\<BS>o\<BS>o/xxx\<cr>", 'tx') + call assert_equal('foo 3', getline(3)) + call assert_equal('xxx 4', getline(4)) + call assert_equal('xxx 5', getline(5)) + call assert_equal('xxx 6', getline(6)) + call assert_equal('foo 7', getline(7)) + + call Incsearch_cleanup() +endfunc + func Test_search_undefined_behaviour() if !has("terminal") return diff --git a/src/version.c b/src/version.c index 8d02863b7..a8262a7ce 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 275, +/**/ 274, /**/ 273, |