aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-09-03 12:58:41 -0400
committerGitHub <noreply@github.com>2017-09-03 12:58:41 -0400
commitfec6ca7511fdf30cee90d077dbe2ec4040c3d8df (patch)
tree6da13a80ef8f0575505f0bd7c0507343dce3b8d4
parent11429f94293b95394df436cb09d64a528fa387db (diff)
parent69a201d6c5504ded687a0603c2a6e88531deb5dc (diff)
downloadrneovim-fec6ca7511fdf30cee90d077dbe2ec4040c3d8df.tar.gz
rneovim-fec6ca7511fdf30cee90d077dbe2ec4040c3d8df.tar.bz2
rneovim-fec6ca7511fdf30cee90d077dbe2ec4040c3d8df.zip
Merge pull request #7233 from yjhan96/vim-8.0.0125
vim-patch:8.0.0125
-rw-r--r--src/nvim/testdir/test_cmdline.vim17
-rw-r--r--src/nvim/version.c2
2 files changed, 18 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim
index bab700284f..2facffb067 100644
--- a/src/nvim/testdir/test_cmdline.vim
+++ b/src/nvim/testdir/test_cmdline.vim
@@ -230,9 +230,26 @@ func Test_paste_in_cmdline()
call feedkeys("f;:aaa \<C-R>\<C-A> bbb\<C-B>\"\<CR>", 'tx')
call assert_equal('"aaa a;b-c*d bbb', @:)
+
+ call feedkeys(":\<C-\>etoupper(getline(1))\<CR>\<C-B>\"\<CR>", 'tx')
+ call assert_equal('"ASDF.X /TMP/SOME VERYLONGWORD A;B-C*D ', @:)
bwipe!
endfunc
+func Test_remove_char_in_cmdline()
+ call feedkeys(":abc def\<S-Left>\<Del>\<C-B>\"\<CR>", 'tx')
+ call assert_equal('"abc ef', @:)
+
+ call feedkeys(":abc def\<S-Left>\<BS>\<C-B>\"\<CR>", 'tx')
+ call assert_equal('"abcdef', @:)
+
+ call feedkeys(":abc def ghi\<S-Left>\<C-W>\<C-B>\"\<CR>", 'tx')
+ call assert_equal('"abc ghi', @:)
+
+ call feedkeys(":abc def\<S-Left>\<C-U>\<C-B>\"\<CR>", 'tx')
+ call assert_equal('"def', @:)
+endfunc
+
func Test_illegal_address()
new
2;'(
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 73ac3fa6ce..6e24e30a09 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -827,7 +827,7 @@ static const int included_patches[] = {
128,
127,
126,
- // 125,
+ 125,
124,
// 123 NA
// 122 NA