summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-02-03 16:53:51 +0100
committerBram Moolenaar <Bram@vim.org>2015-02-03 16:53:51 +0100
commitd7ce7a9ad2d9311f7ec3368eeddec8fce6d8e890 (patch)
treeb82e990014ee00ebdc5687df9fd989eeccd664dd
parent70781ee4035b5fd5e3cbb3fe4c7646e19119f0a8 (diff)
downloadvim-git-7.4.614.tar.gz
updated for version 7.4.614v7.4.614
Problem: There is no test for what patch 7.4.601 fixes. Solution: Add a test. (Christian Brabandt)
-rw-r--r--src/testdir/test_mapping.in8
-rw-r--r--src/testdir/test_mapping.ok3
-rw-r--r--src/version.c2
3 files changed, 13 insertions, 0 deletions
diff --git a/src/testdir/test_mapping.in b/src/testdir/test_mapping.in
index 7ac578f08..979184394 100644
--- a/src/testdir/test_mapping.in
+++ b/src/testdir/test_mapping.in
@@ -31,6 +31,11 @@ o+
: " expr mapping with langmap
:inoremap <expr> { "FAIL_iexplangmap"
o+
+:" issue #212 (feedkeys insert mapping at current position)
+:nnoremap . :call feedkeys(".", "in")<cr>
+:/^a b
+0qqdw.ifooqj0@q:unmap .
+
:/^test/,$w! test.out
:qa!
@@ -38,3 +43,6 @@ ENDTEST
test starts here:
+a b c d
+a b c d
+
diff --git a/src/testdir/test_mapping.ok b/src/testdir/test_mapping.ok
index bf21e514b..6a88f02de 100644
--- a/src/testdir/test_mapping.ok
+++ b/src/testdir/test_mapping.ok
@@ -1,4 +1,7 @@
test starts here:
+
+fooc d
+fooc d
vim
TEST2: CTRL-C |<ctrl-c>A|
diff --git a/src/version.c b/src/version.c
index 2cb8b6e04..efee40de4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 614,
+/**/
613,
/**/
612,