From f2aeba592840d2c2f67ade2500e18fdd71957bb8 Mon Sep 17 00:00:00 2001 From: Larissa Reis Date: Fri, 22 Feb 2019 14:42:43 -0700 Subject: [PATCH 1/2] Do not override user listchars user configured listchars should have higher precedence over indentguides listchars --- plugin/indentguides.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/indentguides.vim b/plugin/indentguides.vim index 52329de..494964d 100644 --- a/plugin/indentguides.vim +++ b/plugin/indentguides.vim @@ -46,9 +46,9 @@ function! s:ToggleIndentGuides(user_initiated) let g:original_listchars = get(g:, 'original_listchars', &g:listchars) " TODO: figure out why checking each addition individually breaks things for tab (unicode?) - let listchar_guides = ',tab:' . g:indentguides_tabchar . ' ,trail:·' + let listchar_guides = 'tab:' . g:indentguides_tabchar . ' ,trail:·,' if &g:listchars !~ listchar_guides - let &g:listchars = &g:listchars . listchar_guides + let &g:listchars = listchar_guides . &g:listchars endif setlocal concealcursor=inc setlocal conceallevel=2 From 0b935138192867dda1aaf47644e9d5e8566a9510 Mon Sep 17 00:00:00 2001 From: Larissa Reis Date: Fri, 22 Feb 2019 14:45:08 -0700 Subject: [PATCH 2/2] Remove unnecessery trail from listchars It does not seem like vim-indentguides is using trail listchar for anything, so including it to the plugin seems unnecessery. --- plugin/indentguides.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/indentguides.vim b/plugin/indentguides.vim index 494964d..eddd359 100644 --- a/plugin/indentguides.vim +++ b/plugin/indentguides.vim @@ -46,7 +46,7 @@ function! s:ToggleIndentGuides(user_initiated) let g:original_listchars = get(g:, 'original_listchars', &g:listchars) " TODO: figure out why checking each addition individually breaks things for tab (unicode?) - let listchar_guides = 'tab:' . g:indentguides_tabchar . ' ,trail:·,' + let listchar_guides = 'tab:' . g:indentguides_tabchar . ' ,' if &g:listchars !~ listchar_guides let &g:listchars = listchar_guides . &g:listchars endif