mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-03 00:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3761 from Shougo/vim-7.4.631

Browse Source 
vim-patch:7.4.631
This commit is contained in:
Justin M. Keyes
2015-12-01 11:56:38 -05:00
parent 84da3e6bbb 41523c28e7
commit 826f474ef0
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/doc/options.txt
View File

@@ -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 1 Each block of concealed text is replaced with one
character. If the syntax item does not have a custom character. If the syntax item does not have a custom
replacement character defined (see |:syn-cchar|) the replacement character defined (see |:syn-cchar|) the
character defined in 'listchars' is used (default is a character defined in 'listchars' is used.
space).
It is highlighted with the "Conceal" highlight group. It is highlighted with the "Conceal" highlight group.
2 Concealed text is completely hidden unless it has a 2 Concealed text is completely hidden unless it has a
custom replacement character defined (see 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. visible in the first column.
*lcs-conceal* *lcs-conceal*
conceal:c Character to show in place of concealed text, when 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* *lcs-nbsp*
nbsp:c Character to show for a non-breakable space (character nbsp:c Character to show for a non-breakable space (character
0xA0, 160). Left blank when omitted. 0xA0, 160). Left blank when omitted.

2
src/nvim/globals.h
View File

@@ -1042,7 +1042,7 @@ EXTERN int lcs_space INIT(= NUL);
EXTERN int lcs_tab1 INIT(= NUL); EXTERN int lcs_tab1 INIT(= NUL);
EXTERN int lcs_tab2 INIT(= NUL); EXTERN int lcs_tab2 INIT(= NUL);
EXTERN int lcs_trail INIT(= NUL); EXTERN int lcs_trail INIT(= NUL);
EXTERN int lcs_conceal INIT(= '-'); EXTERN int lcs_conceal INIT(= ' ');
/* Characters from 'fillchars' option */ /* Characters from 'fillchars' option */
EXTERN int fill_stl INIT(= ' '); EXTERN int fill_stl INIT(= ' ');

2
src/nvim/version.c
View File

@@ -365,7 +365,7 @@ static int included_patches[] = {
// 634, // 634,
633, 633,
// 632 NA // 632 NA
// 631, 631,
630, 630,
629, 629,
// 628, // 628,