summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-04-21 19:10:48 +0200
committerBram Moolenaar <Bram@vim.org>2015-04-21 19:10:48 +0200
commit4c6b3b20dd86bb44247bb82ffc3b67eaee830954 (patch)
tree9f0ac3c348165ae76d92dd2febed1388e5663d12
parent79278367337be1e9a12222698642dcce0af1e059 (diff)
downloadvim-git-4c6b3b20dd86bb44247bb82ffc3b67eaee830954.tar.gz
patch 7.4.711v7.4.711
Problem: Missing change in one file. Solution: Also change option.c
-rw-r--r--src/option.c1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c
index cf3a31762..56d94934d 100644
--- a/src/option.c
+++ b/src/option.c
@@ -7322,6 +7322,7 @@ set_chars_option(varp)
{&lcs_ext, "extends"},
{&lcs_nbsp, "nbsp"},
{&lcs_prec, "precedes"},
+ {&lcs_space, "space"},
{&lcs_tab2, "tab"},
{&lcs_trail, "trail"},
#ifdef FEAT_CONCEAL
diff --git a/src/version.c b/src/version.c
index 06fb40e80..7fbf58a09 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 */
/**/
+ 711,
+/**/
710,
/**/
709,