diff options
| author | Ömer Sinan Ağacan <omeragacan@gmail.com> | 2018-01-21 15:09:17 +0300 |
|---|---|---|
| committer | Ömer Sinan Ağacan <omeragacan@gmail.com> | 2018-01-26 18:39:20 +0300 |
| commit | 9bc1410ee1a467a8058a8de585c0e68d64ef8521 (patch) | |
| tree | 14d26e2579dae05b595c5ff3b8fdf58b7b925845 /src/nvim/ex_getln.c | |
| parent | cd59577d576d71aa788a873ce779ce6dc3e7bc21 (diff) | |
| download | rneovim-9bc1410ee1a467a8058a8de585c0e68d64ef8521.tar.gz rneovim-9bc1410ee1a467a8058a8de585c0e68d64ef8521.tar.bz2 rneovim-9bc1410ee1a467a8058a8de585c0e68d64ef8521.zip | |
vim-patch:8.0.1304: CTRL-G/CTRL-T don't work with incsearch and empty pattern
Problem: CTRL-G/CTRL-T don't work with incsearch and empty pattern.
Solution: Use the last search pattern. (Christian Brabandt, closes vim/vim#2292)
https://github.com/vim/vim/commit/d0480097177369a6ed91d47aba189ae647afcd68
Diffstat (limited to 'src/nvim/ex_getln.c')
| -rw-r--r-- | src/nvim/ex_getln.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index e396a179a1..2178505874 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -1019,7 +1019,16 @@ static void command_line_next_incsearch(CommandLineState *s, bool next_match) ui_flush(); pos_T t; + char_u *pat; int search_flags = SEARCH_NOOF; + + + if (s->firstc == ccline.cmdbuff[0]) { + pat = last_search_pattern(); + } else { + pat = ccline.cmdbuff; + } + save_last_search_pattern(); if (next_match) { @@ -1039,7 +1048,7 @@ static void command_line_next_incsearch(CommandLineState *s, bool next_match) emsg_off++; s->i = searchit(curwin, curbuf, &t, next_match ? FORWARD : BACKWARD, - ccline.cmdbuff, s->count, search_flags, + pat, s->count, search_flags, RE_SEARCH, 0, NULL); emsg_off--; ui_busy_stop(); |