summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-03-25 23:16:34 +0100
committerBram Moolenaar <Bram@vim.org>2019-03-25 23:16:34 +0100
commit553e5a5c568e7d175b65b0472cd6d9843b25f4c8 (patch)
tree6fb99fd7b13e225f493462ff17648bfd6b748fa3
parenta4c2a24cc7772d882289a617104fe968a15969d7 (diff)
downloadvim-git-553e5a5c568e7d175b65b0472cd6d9843b25f4c8.tar.gz
patch 8.1.1052: test for CTRL-C message sometimes failsv8.1.1052
Problem: test for CTRL-C message sometimes fails Solution: Make sure there are no changed buffers.
-rw-r--r--src/testdir/test_normal.vim5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 4c63bb8ab..19e68116c 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -2546,11 +2546,16 @@ func Test_nv_hat_count()
endfunc
func Test_message_when_using_ctrl_c()
+ " Make sure no buffers are changed.
+ %bwipe!
+
exe "normal \<C-C>"
call assert_match("Type :qa and press <Enter> to exit Vim", Screenline(&lines))
+
new
cal setline(1, 'hi!')
exe "normal \<C-C>"
call assert_match("Type :qa! and press <Enter> to abandon all changes and exit Vim", Screenline(&lines))
+
bwipe!
endfunc
diff --git a/src/version.c b/src/version.c
index 13db4015e..1f0fb6b25 100644
--- a/src/version.c
+++ b/src/version.c
@@ -776,6 +776,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1052,
+/**/
1051,
/**/
1050,