Permalink
Browse files

patch 8.0.1210: CTRL-G and CTRL-T are ignored with typeahead

Problem:    When typing a search pattern CTRL-G and CTRL-T are ignored when
            there is typeahead.
Solution:   Don't pass SEARCH_PEEK and don't call char_avail(). (haya14busa,
            closes #2233)
  • Loading branch information...
brammool committed Oct 22, 2017
1 parent 53f0c96 commit f8e8c0643b1cd97db11912bc4f773e1328a0da02
Showing with 39 additions and 13 deletions.
  1. +17 −13 src/ex_getln.c
  2. +20 −0 src/testdir/test_search.vim
  3. +2 −0 src/version.c
View
@@ -158,6 +158,20 @@ trigger_cmd_autocmd(int typechar, int evt)
}
#endif
/*
* Abandon the command line.
*/
static void
abandon_cmdline(void)
{
vim_free(ccline.cmdbuff);
ccline.cmdbuff = NULL;
if (msg_scrolled == 0)
compute_cmdrow();
MSG("");
redraw_cmdline = TRUE;
}
/*
* getcmdline() - accept a command line starting with firstc.
*
@@ -1702,11 +1716,8 @@ getcmdline(
if (p_is && !cmd_silent && (firstc == '/' || firstc == '?'))
{
pos_T t;
int search_flags = SEARCH_KEEP + SEARCH_NOOF
+ SEARCH_PEEK;
int search_flags = SEARCH_KEEP + SEARCH_NOOF;
if (char_avail())
continue;
cursor_off();
out_flush();
if (c == Ctrl_G)
@@ -2083,15 +2094,8 @@ getcmdline(
}
#endif
if (gotesc) /* abandon command line */
{
vim_free(ccline.cmdbuff);
ccline.cmdbuff = NULL;
if (msg_scrolled == 0)
compute_cmdrow();
MSG("");
redraw_cmdline = TRUE;
}
if (gotesc)
abandon_cmdline();
}
/*
@@ -356,6 +356,26 @@ func Test_search_cmdline4()
bw!
endfunc
func Test_search_cmdline5()
if !exists('+incsearch')
return
endif
" Do not call test_override("char_avail", 1) so that <C-g> and <C-t> work
" regardless char_avail.
new
call setline(1, [' 1 the first', ' 2 the second', ' 3 the third'])
set incsearch
1
call feedkeys("/the\<c-g>\<c-g>\<cr>", 'tx')
call assert_equal(' 3 the third', getline('.'))
$
call feedkeys("?the\<c-t>\<c-t>\<c-t>\<cr>", 'tx')
call assert_equal(' 2 the second', getline('.'))
" clean up
set noincsearch
bw!
endfunc
" Tests for regexp with various magic settings
func Test_search_regexp()
enew!
View
@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1210,
/**/
1209,
/**/

0 comments on commit f8e8c06

Please sign in to comment.