summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-12-03 14:05:49 +0100
committerBram Moolenaar <Bram@vim.org>2016-12-03 14:05:49 +0100
commit21efc3633edb58809c5dd89b025d34d7002e731c (patch)
treeeeb90f3e69564bc18872a1715e71104a3b2961f7
parent99c5eb4fd755853a134471a63174cec71becbca7 (diff)
patch 8.0.0119v8.0.0119
Problem: No test for using CTRL-R on the command line. Solution: Add a test. (Dominique Pelle) And some more.
-rw-r--r--src/testdir/test_cmdline.vim23
-rw-r--r--src/version.c2
2 files changed, 25 insertions, 0 deletions
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 3718087eb1..3080971b58 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -194,3 +194,26 @@ func Test_expand_star_star()
bwipe!
call delete('a', 'rf')
endfunc
+
+func Test_paste_in_cmdline()
+ let @a = "def"
+ call feedkeys(":abc \<C-R>a ghi\<C-B>\"\<CR>", 'tx')
+ call assert_equal('"abc def ghi', @:)
+
+ new
+ call setline(1, 'asdf.x /tmp/some verylongword a;b-c*d ')
+
+ call feedkeys(":aaa \<C-R>\<C-W> bbb\<C-B>\"\<CR>", 'tx')
+ call assert_equal('"aaa asdf bbb', @:)
+
+ call feedkeys("ft:aaa \<C-R>\<C-F> bbb\<C-B>\"\<CR>", 'tx')
+ call assert_equal('"aaa /tmp/some bbb', @:)
+
+ set incsearch
+ call feedkeys("fy:aaa veryl\<C-R>\<C-W> bbb\<C-B>\"\<CR>", 'tx')
+ call assert_equal('"aaa verylongword bbb', @:)
+
+ call feedkeys("f;:aaa \<C-R>\<C-A> bbb\<C-B>\"\<CR>", 'tx')
+ call assert_equal('"aaa a;b-c*d bbb', @:)
+ bwipe!
+endfunc
diff --git a/src/version.c b/src/version.c
index cf91feb679..eaf4a38b2a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 119,
+/**/
118,
/**/
117,