diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-12-04 15:11:08 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-12-04 15:11:08 +0100 |
| commit | 85db5475982e166ec5bb1c8c9a5c8bf062d49ed1 (patch) | |
| tree | d61a1dd1644b21bd9f49343b5e9a37d51f1fe462 /src | |
| parent | 079119babe1cbba3f9234927e62fd75465f2d6b4 (diff) | |
patch 8.1.2385: opening cmdline window with feedkeys() does not workv8.1.2385
Problem: Opening cmdline window with feedkeys() does not work. (Yegappan
Lakshmanan)
Solution: Recognize K_CMDWIN also when ex_normal_busy is set.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_getln.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_cmdline.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c index 25f409b743..769dcb8363 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -1361,7 +1361,8 @@ getcmdline_int( #ifdef FEAT_CMDWIN if (c == cedit_key || c == K_CMDWIN) { - if (ex_normal_busy == 0 && got_int == FALSE) + // TODO: why is ex_normal_busy checked here? + if ((c == K_CMDWIN || ex_normal_busy == 0) && got_int == FALSE) { /* * Open a window to edit the command line (and history). diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index 7a4979e015..5e25979302 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -843,3 +843,8 @@ func Test_buffers_lastused() bwipeout bufb bwipeout bufc endfunc + +func Test_cmdwin_feedkeys() + " This should not generate E488 + call feedkeys("q:\<CR>", 'x') +endfunc diff --git a/src/version.c b/src/version.c index f7c6e343a9..abe541b6d0 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2385, +/**/ 2384, /**/ 2383, |