diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-12-28 06:10:35 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-12-28 06:10:35 -0500 |
| commit | 25a9e454625a6cfa017d4776f2759b2affd5cbc3 (patch) | |
| tree | ba26ec5dd9dc0dfab70f6bfbe08d41c1da7cb84b | |
| parent | 76ebbda9df3c155313f164e510aef8daef5f8ade (diff) | |
| parent | a42e5eeb79f310d3a59dbbce9e7d2fb02f81783d (diff) | |
| download | rneovim-25a9e454625a6cfa017d4776f2759b2affd5cbc3.tar.gz rneovim-25a9e454625a6cfa017d4776f2759b2affd5cbc3.tar.bz2 rneovim-25a9e454625a6cfa017d4776f2759b2affd5cbc3.zip | |
Merge pull request #521 from oni-link/vim-patch-7-4-211
vim-patch:7.4.211
| -rw-r--r-- | src/nvim/ex_cmds.lua | 10 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua index b85c25216d..aade4d736d 100644 --- a/src/nvim/ex_cmds.lua +++ b/src/nvim/ex_cmds.lua @@ -1236,6 +1236,11 @@ return { func='ex_tag', }, { + command='lunmap', + flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN), + func='ex_unmap', + }, + { command='lua', flags=bit.bor(RANGE, EXTRA, NEEDARG, CMDWIN), func='ex_script_ni', @@ -1251,11 +1256,6 @@ return { func='ex_ni', }, { - command='lunmap', - flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN), - func='ex_unmap', - }, - { command='lvimgrep', flags=bit.bor(RANGE, NOTADR, BANG, NEEDARG, EXTRA, NOTRLCOM, TRLBAR, XFILE), func='ex_vimgrep', diff --git a/src/nvim/version.c b/src/nvim/version.c index cafc5d833d..288342a3a8 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -526,7 +526,7 @@ static int included_patches[] = { //214 NA 213, //212 NA - //211, + 211, 210, 209, //208 NA |