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
commitacd5316739bd8cb8daf5f42c36e11b46106752b6 (patch)
tree9c97dcd8d8b2fd1d27d3b451754da063a241b4ce
parentb4f009e2720a0e9b6bf030ee8fe17cc3bc8b79e3 (diff)
downloadvim-acd5316739bd8cb8daf5f42c36e11b46106752b6.tar.gz
updated for version 7.4.614v7.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 7ac578f0..97918439 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 bf21e514..6a88f02d 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 2cb8b6e0..efee40de 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,