summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-20 15:03:38 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-20 15:03:38 +0200
commitb326edf5b30813b2ccdee3ac07ee6495ca5187ff (patch)
tree9264b14a0a776b01d1c2d603337915da68024f97
parentef6746f637adbdb6860b4fa0266c43c49fa498bc (diff)
downloadvim-git-b326edf5b30813b2ccdee3ac07ee6495ca5187ff.tar.gz
patch 8.2.1020: popupwin test fails in the GUIv8.2.1020
Problem: Popupwin test fails in the GUI. Solution: Send GUI byte sequence for <C-S-a>.
-rw-r--r--src/testdir/test_popupwin.vim6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index b6f718c84..42f4256c3 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -3349,7 +3349,11 @@ func Test_popupwin_filter_input_multibyte()
if has('unix')
" with modifyOtherKeys <M-S-a> does not include a modifier sequence
- call feedkeys("\<Esc>[27;4;65~", 'Lx!')
+ if has('gui_running')
+ call feedkeys("\x9b\xfc\x08A", 'Lx!')
+ else
+ call feedkeys("\<Esc>[27;4;65~", 'Lx!')
+ endif
call assert_equal([0xc3, 0x81], g:bytes)
endif
diff --git a/src/version.c b/src/version.c
index 5d7e45135..b9e6d5bda 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1020,
+/**/
1019,
/**/
1018,