aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2015-12-01 11:56:38 -0500
committerJustin M. Keyes <justinkz@gmail.com>2015-12-01 11:56:38 -0500
commit826f474ef06e8a406fa398e7ee461457f26a0e8e (patch)
treef1bb0385d5e190f7fd1870813ad4ff27f8692f21 /runtime
parent84da3e6bbbea89765c1218a8659304823c7045e0 (diff)
parent41523c28e7489e8e9148371ffb5ea95f6f14bc5d (diff)
downloadrneovim-826f474ef06e8a406fa398e7ee461457f26a0e8e.tar.gz
rneovim-826f474ef06e8a406fa398e7ee461457f26a0e8e.tar.bz2
rneovim-826f474ef06e8a406fa398e7ee461457f26a0e8e.zip
Merge pull request #3761 from Shougo/vim-7.4.631
vim-patch:7.4.631
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/options.txt5
1 files changed, 2 insertions, 3 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.