Further simplifications

1 files changed, 7 insertions, 6 deletions

diff --git a/vimrc-full b/vimrc-full
index c6dc9d8..f192eb3 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -59,7 +59,11 @@ if has("multi_byte")
   " set listchars+=eol:↲     | " symbols used when using :set list (which displays non-printable chars)
   " set listchars+=space:·   | " symbols used when using :set list (which displays non-printable chars)
   set showbreak+=›           | " symbol used in the beginning of a wrapped line
-  set list
+
+  " automatically enter list mode when going in insert mode (makes above syntax command temporarily ineffective)
+  set nolist
+  autocmd InsertEnter * set list
+  autocmd InsertLeave * set nolist
 " set fillchars+=stlnc:\―       | "
 end
 
@@ -234,7 +238,8 @@ set foldnestmax=1             | " top level folding only
 set foldopen=block,hor,search | " when do we unfold?
 " set foldtext=Foldtext()       | "
 " set foldtext=v:folddashes.substitute(getline(v:foldstart),'\\v^/[/*]\','','g')
-set foldtext='⊞\ '.substitute(getline(v:foldstart),'^[\ '.printf(&cms,'').']*','','').'↵'.getline(v:foldstart+1).'↵'.getline(v:foldstart+2)
+" set foldtext='⊞\ '.substitute(getline(v:foldstart),'^[\ '.printf(&cms,'').']*','','').'↵'.getline(v:foldstart+1).'↵'.getline(v:foldstart+2)
+ set foldtext='⊞\ '.substitute(join(getline(v:foldstart,v:foldend),'↵'),'\[*\/\]','','g')
 
 " vim window behaviour
 set splitbelow                | " open new windows below the current one (i find that more intuitive)
@@ -1031,10 +1036,6 @@ function! ExtendColorTheme()
 
   highlight! link Convention Error
 
-  " automatically enter list mode when going in insert mode (makes above syntax command temporarily ineffective)
-  autocmd InsertEnter * set list
-  autocmd InsertLeave * set nolist
-
   " autocmd InsertLeave * call matchadd('Conceal', ' \+$', -1, 101, { 'conceal': '⟶' })
   autocmd InsertEnter * silent! call matchdelete(101)
   autocmd InsertLeave * call matchadd('Convention', ' \+$', -1, 101, { 'conceal': '⟶' })