# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1452182405 -3600
# Node ID 9985800f116d1b93cd6076d87cac366a3dc5ecc3
# Parent  b8104d67b9767bc7cde83960685f41c4e6d6c69f
commit https://github.com/vim/vim/commit/2b7db933b0418f3964da5399047ce8998007874c
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Jan 7 16:52:10 2016 +0100

    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
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -794,7 +794,7 @@ call append("$", "infercase\tadjust case
 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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1057,
+/**/
     1056,
 /**/
     1055,