diff options
| author | lonerover <pathfinder1644@yahoo.com> | 2017-03-11 18:09:15 +0800 |
|---|---|---|
| committer | lonerover <pathfinder1644@yahoo.com> | 2017-03-11 18:26:03 +0800 |
| commit | 3de33401324433b3a0ba3d217f0fae2fa3f6731f (patch) | |
| tree | 738edec4eb8c8743bac58adfd9ae8b8df4c67cd8 | |
| parent | 1743df82f9003514c384ff99779d82179e6cb999 (diff) | |
| download | rneovim-3de33401324433b3a0ba3d217f0fae2fa3f6731f.tar.gz rneovim-3de33401324433b3a0ba3d217f0fae2fa3f6731f.tar.bz2 rneovim-3de33401324433b3a0ba3d217f0fae2fa3f6731f.zip | |
vim-patch:7.4.2135
Problem: Various tiny issues.
Solution: Update comments, white space, etc.
https://github.com/vim/vim/commit/89eaa4185efacab253b23a182c1c8a7bbf1096c9
| -rw-r--r-- | runtime/menu.vim | 2 | ||||
| -rw-r--r-- | src/nvim/diff.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | test/functional/legacy/080_substitute_spec.lua | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/runtime/menu.vim b/runtime/menu.vim index 4971baa936..7cb530a331 100644 --- a/runtime/menu.vim +++ b/runtime/menu.vim @@ -2,7 +2,7 @@ " You can also use this as a start for your own set of menus. " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2014 May 22 +" Last Change: 2016 Jul 27 " Note that ":an" (short for ":anoremenu") is often used to make a menu work " in all modes and avoid side effects from mappings defined by the user. diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 5940dc55da..11ade20c1c 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -129,7 +129,7 @@ void diff_buf_add(buf_T *buf) } } - EMSGN(_("E96: Can not diff more than %" PRId64 " buffers"), DB_COUNT); + EMSGN(_("E96: Cannot diff more than %" PRId64 " buffers"), DB_COUNT); } /// Find buffer "buf" in the list of diff buffers for the current tab page. diff --git a/src/nvim/version.c b/src/nvim/version.c index c4d31c4abe..e39ba83e8b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -305,7 +305,7 @@ static int included_patches[] = { // 2138 NA 2137, 2136, - // 2135, + 2135, 2134, // 2133 NA // 2132 NA diff --git a/test/functional/legacy/080_substitute_spec.lua b/test/functional/legacy/080_substitute_spec.lua index 1bdae9be59..6b4d82a4c0 100644 --- a/test/functional/legacy/080_substitute_spec.lua +++ b/test/functional/legacy/080_substitute_spec.lua @@ -1,5 +1,5 @@ --- Test for *sub-replace-special* and *sub-replace-expression* on substitue(). --- Test for submatch() on substitue(). +-- Test for *sub-replace-special* and *sub-replace-expression* on substitute(). +-- Test for submatch() on substitute(). -- Test for *:s%* on :substitute. local helpers = require('test.functional.helpers')(after_each) |