summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-07 16:52:10 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-07 16:52:10 +0100
commit2b7db933b0418f3964da5399047ce8998007874c (patch)
tree72a05fb956ae98b10981b5225976dc6d2bf99b25
parentca1fe985175385c609f8e06672a1014729aba05c (diff)
patch 7.4.1057v7.4.1057
Problem: Typos in the :options window. Solution: Fix the typos. (Dominique Pelle)
-rw-r--r--runtime/optwin.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index ecfec901bf..7318483306 100644
--- 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 43fa15a298..b20ebd4585 100644
--- 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,