aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/option.c3
-rw-r--r--src/nvim/options.lua4
-rw-r--r--src/nvim/testdir/test_breakindent.in2
3 files changed, 6 insertions, 3 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 9a375c0675..2d6e2af89e 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -515,6 +515,9 @@ void set_init_1(void)
/* Parse default for 'fillchars'. */
(void)set_chars_option(&p_fcs);
+ /* Parse default for 'listchars'. */
+ (void)set_chars_option(&p_lcs);
+
/* enc_locale() will try to find the encoding of the current locale. */
p = enc_locale();
if (p != NULL) {
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index b269bfdc98..6506c6a9b5 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -1422,10 +1422,10 @@ return {
full_name='listchars', abbreviation='lcs',
type='string', list='comma', scope={'global'},
deny_duplicates=true,
- vi_def=true,
+ vim=true,
redraw={'all_windows'},
varname='p_lcs',
- defaults={if_true={vi="eol:$"}}
+ defaults={if_true={vi="eol:$", vim="tab:> ,trail:-,nbsp:+"}}
},
{
full_name='loadplugins', abbreviation='lpl',
diff --git a/src/nvim/testdir/test_breakindent.in b/src/nvim/testdir/test_breakindent.in
index 5c6ec4d927..b05aef7f8d 100644
--- a/src/nvim/testdir/test_breakindent.in
+++ b/src/nvim/testdir/test_breakindent.in
@@ -57,7 +57,7 @@ STARTTEST
:let line1=ScreenChar(line('.'),10)
:call DoRecordScreen()
:let g:test=" Test 8: breakindent + shift:1 + nu + sbr=# list briopt:sbr"
-:set briopt=shift:1,sbr,min:0 nu sbr=# list
+:set briopt=shift:1,sbr,min:0 nu sbr=# list lcs&vi
:let line1=ScreenChar(line('.'),10)
:call DoRecordScreen()
:let g:test=" Test 9: breakindent + shift by +1 + 'nu' + sbr=# list"