diff options
| author | KunMing Xie <qqzz014@gmail.com> | 2017-07-30 07:36:44 +0800 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-07-30 01:36:44 +0200 |
| commit | 743993eb553302a461ee0ef9cffa57f93c10c955 (patch) | |
| tree | ec7c704982a8fabb676700b218f066eb6c84cc0e | |
| parent | b3ca7112c6fd964fbd114aa38d7fa39420c424d4 (diff) | |
| download | rneovim-743993eb553302a461ee0ef9cffa57f93c10c955.tar.gz rneovim-743993eb553302a461ee0ef9cffa57f93c10c955.tar.bz2 rneovim-743993eb553302a461ee0ef9cffa57f93c10c955.zip | |
vim-patch:8.0.0119 (#7091)
Problem: No test for using CTRL-R on the command line.
Solution: Add a test. (Dominique Pelle) And some more.
https://github.com/vim/vim/commit/21efc3633edb58809c5dd89b025d34d7002e731c
| -rw-r--r-- | src/nvim/testdir/test_cmdline.vim | 23 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 24 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim index f7a6aba6e7..c3bfae1b7b 100644 --- a/src/nvim/testdir/test_cmdline.vim +++ b/src/nvim/testdir/test_cmdline.vim @@ -209,3 +209,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/nvim/version.c b/src/nvim/version.c index 31d3122f95..4f83b09e1b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -610,7 +610,7 @@ static const int included_patches[] = { // 122 NA 121, // 120 NA - // 119, + 119, // 118, // 117 NA 116, |