From 817438f16c7b9a97ebb3466ae99990fe24f5bfe0 Mon Sep 17 00:00:00 2001
From: Michael Ennen <mike.ennen@gmail.com>
Date: Thu, 19 May 2016 21:21:58 -0700
Subject: vim-patch:7.4.1057

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

https://github.com/vim/vim/commit/2b7db933b0418f3964da5399047ce8998007874c
---
 runtime/optwin.vim | 4 ++--
 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 3746f53e1f..b5a5c00dfc 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -626,7 +626,7 @@ static int included_patches[] = {
   // 1060 NA
   // 1059,
   // 1058,
-  // 1057,
+  1057,
   // 1056,
   1055,
   1054,
-- 
cgit