patch 7.4.1057

Problem:    Typos in the :options window.
Solution:   Fix the typos. (Dominique Pelle)

diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index ecfec901bf092b07f534001fe9f1074f9489b865..7318483306ba959582cef081c84a0329c0f50e30 100644 (file)
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -794,7 +794,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")
@@ -1199,7 +1199,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/version.c b/src/version.c
index 43fa15a298c4e425cb6c1c50ed966379457871c0..b20ebd45858e7d5c394b7dfd5c7eebb2f1e423f4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1057,
 /**/
     1056,
 /**/