Skip to content

Commit de15457

Browse files
committed
Fix override on vim startup
Realy only on indent_guides_enable_on_vim_startup
1 parent b2a581f commit de15457

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

autoload/indent_guides.vim

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endfunction
1919
" other buffers and windows.
2020
"
2121
function! indent_guides#process_autocmds()
22-
if indent_guides#getvar('indent_guides_autocmds_enabled')
22+
if indent_guides#getvar('indent_guides_enable_on_vim_startup')
2323
call indent_guides#enable()
2424
else
2525
call indent_guides#disable()
@@ -30,7 +30,7 @@ endfunction
3030
" Enables the indent guides for the current buffer
3131
"
3232
function! indent_guides#enable()
33-
let b:indent_guides_autocmds_enabled = 1
33+
let b:indent_guides_enable_on_vim_startup = 1
3434

3535
if &diff || indent_guides#exclude_filetype()
3636
call indent_guides#clear_matches()
@@ -64,7 +64,7 @@ endfunction
6464
" entering it.
6565
"
6666
function! indent_guides#disable()
67-
let b:indent_guides_autocmds_enabled = 0
67+
let b:indent_guides_enable_on_vim_startup = 0
6868
call indent_guides#clear_matches()
6969
endfunction
7070

plugin/indent_guides.vim

-6
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ function s:InitVariable(var, value)
4444
endfunction
4545

4646
" Fixed global variables
47-
let g:indent_guides_autocmds_enabled = 0
4847
let g:indent_guides_color_hex_pattern = '#[0-9A-Fa-f]\{6\}'
4948
let g:indent_guides_color_hex_guibg_pattern = 'guibg=\zs' . g:indent_guides_color_hex_pattern . '\ze'
5049
let g:indent_guides_color_name_guibg_pattern = "guibg='\\?\\zs[0-9A-Za-z ]\\+\\ze'\\?"
@@ -81,11 +80,6 @@ nnoremap <unique><script> <Plug>IndentGuidesDisable :IndentGuidesDisable<CR>
8180
augroup indent_guides
8281
autocmd!
8382

84-
if g:indent_guides_enable_on_vim_startup
85-
let g:indent_guides_autocmds_enabled = 1
86-
autocmd VimEnter * :IndentGuidesEnable
87-
endif
88-
8983
autocmd BufEnter,WinEnter,FileType * call indent_guides#process_autocmds()
9084

9185
" Trigger BufEnter and process modelines.

0 commit comments

Comments
 (0)