summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_mswin_event.vim22
-rw-r--r--src/version.c2
2 files changed, 13 insertions, 11 deletions
diff --git a/src/testdir/test_mswin_event.vim b/src/testdir/test_mswin_event.vim
index 950fc61ea1..3b7b3c7d5e 100644
--- a/src/testdir/test_mswin_event.vim
+++ b/src/testdir/test_mswin_event.vim
@@ -470,19 +470,19 @@ func Test_mswin_event_character_keys()
" Test for <Ctrl-A> to <Ctrl-Z> keys
" Expect the unicode characters 0x01 to 0x1A
-" Note: May cause an Interrupt to be triggered for Ctrl-C
+" Note: Skip C because it triggers an Interrupt (CTRL-C)
+" which causes a test failure
for modkey in [s:VK.CONTROL, s:VK.LCONTROL, s:VK.RCONTROL]
for kc in range(65, 90)
- try
- call SendKeyGroup([modkey, kc])
- let ch = Getcharstr()
- call assert_equal(nr2char(kc - 64), ch)
- call SendKeyWithModifiers(kc, s:MOD_MASK_CTRL)
- let ch = Getcharstr()
- call assert_equal(nr2char(kc - 64), ch)
- catch /^Vim:Interrupt$/
- " ignore
- endtry
+ if kc == 67
+ continue
+ endif
+ call SendKeyGroup([modkey, kc])
+ let ch = Getcharstr()
+ call assert_equal(nr2char(kc - 64), ch)
+ call SendKeyWithModifiers(kc, s:MOD_MASK_CTRL)
+ let ch = Getcharstr()
+ call assert_equal(nr2char(kc - 64), ch)
endfor
endfor
diff --git a/src/version.c b/src/version.c
index d06e7e99a5..8f13f3f18d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 57,
+/**/
56,
/**/
55,