diff options
author | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2015-11-29 17:03:17 +0900 |
---|---|---|
committer | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2015-12-01 07:54:35 +0900 |
commit | 41523c28e7489e8e9148371ffb5ea95f6f14bc5d (patch) | |
tree | ad147e75e8b2e80a7a1988335cd49bb7a9b0a603 /src | |
parent | a03af86cc28d9e755f5941b5dfaf54d003a1ad97 (diff) | |
download | rneovim-41523c28e7489e8e9148371ffb5ea95f6f14bc5d.tar.gz rneovim-41523c28e7489e8e9148371ffb5ea95f6f14bc5d.tar.bz2 rneovim-41523c28e7489e8e9148371ffb5ea95f6f14bc5d.zip |
vim-patch:7.4.631
Problem: The default conceal character is documented to be a space but it's
initially a dash. (Christian Brabandt)
Solution: Make the intial value a space.
https://github.com/vim/vim/commit/4a427106954857c6f84c0b0dc07725e302a433c6
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/globals.h | 2 | ||||
-rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h index a623c3c38a..3eab74a08d 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -991,7 +991,7 @@ EXTERN int lcs_space INIT(= NUL); EXTERN int lcs_tab1 INIT(= NUL); EXTERN int lcs_tab2 INIT(= NUL); EXTERN int lcs_trail INIT(= NUL); -EXTERN int lcs_conceal INIT(= '-'); +EXTERN int lcs_conceal INIT(= ' '); /* Characters from 'fillchars' option */ EXTERN int fill_stl INIT(= ' '); diff --git a/src/nvim/version.c b/src/nvim/version.c index d5bbd734f4..49702fd3ae 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -365,7 +365,7 @@ static int included_patches[] = { // 634, 633, // 632 NA - // 631, + 631, 630, 629, // 628, |