Merge pull request #4790 from brcolow/vim-7.4.1057

vim-patch:7.4.1057

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")

src/nvim/version.c

@@ -627,7 +627,7 @@ static int included_patches[] = {
   // 1060 NA
   // 1059,
   // 1058,
-  // 1057,
+  1057,
   // 1056,
   1055,
   1054,