aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/doc/options.txt5
-rw-r--r--src/nvim/globals.h2
-rw-r--r--src/nvim/version.c2
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 d06cf6bfda..52eebebf41 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -1042,7 +1042,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 c2a3193344..c9a779b5c8 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,