diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-20 00:24:35 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-20 00:24:35 -0400 |
| commit | 1ead15ad815b8e38777ab73edf4e49076dbbaee2 (patch) | |
| tree | 8cb0d618b3d853f8780da803b8e53e0a95d2c536 | |
| parent | 0838d59a7ca7f616ffb793702b7a5484ba855aed (diff) | |
| parent | 817438f16c7b9a97ebb3466ae99990fe24f5bfe0 (diff) | |
| download | rneovim-1ead15ad815b8e38777ab73edf4e49076dbbaee2.tar.gz rneovim-1ead15ad815b8e38777ab73edf4e49076dbbaee2.tar.bz2 rneovim-1ead15ad815b8e38777ab73edf4e49076dbbaee2.zip | |
Merge pull request #4790 from brcolow/vim-7.4.1057
vim-patch:7.4.1057
| -rw-r--r-- | runtime/optwin.vim | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 07dcd31b1b..68444dde01 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -766,7 +766,7 @@ call append("$", "infercase\tadjust case of a keyword completion match") call append("$", "\t(local to buffer)") call <SID>BinOptionL("inf") if has("digraphs") - call append("$", "digraph\tenable entering digraps with c1 <BS> c2") + call append("$", "digraph\tenable entering digraphs with c1 <BS> c2") call <SID>BinOptionG("dg", &dg) endif call append("$", "tildeop\tthe \"~\" command behaves like an operator") @@ -1142,7 +1142,7 @@ if has("arabic") call <SID>BinOptionG("tbidi", &tbidi) endif if has("keymap") - call append("$", "keymap\tname of a keyboard mappping") + call append("$", "keymap\tname of a keyboard mapping") call <SID>OptionL("kmp") endif if has("langmap") diff --git a/src/nvim/version.c b/src/nvim/version.c index 56ede1aa78..be66ba14fa 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -627,7 +627,7 @@ static int included_patches[] = { // 1060 NA // 1059, // 1058, - // 1057, + 1057, // 1056, 1055, 1054, |