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)
diff --git a/src/ex_getln.c b/src/ex_getln.c
index ceeeaf8..6876a21 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -159,6 +159,20 @@
#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.
*
* firstc == ':' get ":" command line.
@@ -1702,11 +1716,8 @@
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 @@
}
#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();
}
/*
diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim
index e6a46ff..19e631e 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -356,6 +356,26 @@
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!
diff --git a/src/version.c b/src/version.c
index b0eefff..6ab48f1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1210,
+/**/
1209,
/**/
1208,