diff options
author | David Bürgin <676c7473@gmail.com> | 2015-04-23 18:53:10 +0200 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2015-04-27 04:58:37 -0400 |
commit | b52deb6cc81c75ef5bc1a62f2abcaf46e682f323 (patch) | |
tree | 27ab1663279fd943f6a5054e278d7d56f9805165 /src | |
parent | 7f0764629495a5e0568ee625e8f89a8121235940 (diff) | |
download | rneovim-b52deb6cc81c75ef5bc1a62f2abcaf46e682f323.tar.gz rneovim-b52deb6cc81c75ef5bc1a62f2abcaf46e682f323.tar.bz2 rneovim-b52deb6cc81c75ef5bc1a62f2abcaf46e682f323.zip |
vim-patch:7.4.711
Problem: Missing change in one file.
Solution: Also change option.c
https://github.com/vim/vim/releases/tag/v7-4-711
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/option.c | 1 | ||||
-rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 12118cdebc..7c28064ea0 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -4502,6 +4502,7 @@ static char_u *set_chars_option(char_u **varp) {&lcs_ext, "extends"}, {&lcs_nbsp, "nbsp"}, {&lcs_prec, "precedes"}, + {&lcs_space, "space"}, {&lcs_tab2, "tab"}, {&lcs_trail, "trail"}, {&lcs_conceal, "conceal"}, diff --git a/src/nvim/version.c b/src/nvim/version.c index 50e4033b4b..1595abffbf 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -68,7 +68,7 @@ static char *features[] = { // clang-format off static int included_patches[] = { //712, - //711, + 711, 710, //709, //708, |