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 | |
| 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
| -rw-r--r-- | runtime/doc/options.txt | 5 | ||||
| -rw-r--r-- | src/nvim/globals.h | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index bbf3da8de7..70a585654e 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1561,8 +1561,7 @@ A jump table for the options with a short description can be found at |Q_op|. 1 Each block of concealed text is replaced with one character. If the syntax item does not have a custom replacement character defined (see |:syn-cchar|) the - character defined in 'listchars' is used (default is a - space). + character defined in 'listchars' is used. It is highlighted with the "Conceal" highlight group. 2 Concealed text is completely hidden unless it has a custom replacement character defined (see @@ -4076,7 +4075,7 @@ A jump table for the options with a short description can be found at |Q_op|. visible in the first column. *lcs-conceal* conceal:c Character to show in place of concealed text, when - 'conceallevel' is set to 1. + 'conceallevel' is set to 1. A space when omitted. *lcs-nbsp* nbsp:c Character to show for a non-breakable space (character 0xA0, 160). Left blank when omitted. 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, |