@@ -19,7 +19,7 @@ endfunction
1919" other buffers and windows.
2020"
2121function ! indent_guides#process_autocmds () abort
22- if indent_guides#getvar (' indent_guides_enable_on_vim_startup ' )
22+ if indent_guides#getvar (' enable_on_vim_startup ' )
2323 call indent_guides#enable ()
2424 else
2525 call indent_guides#disable ()
@@ -48,11 +48,11 @@ function! indent_guides#enable() abort
4848 let l: column_start = (l: level - 1 ) * s: indent_size + 1
4949
5050 " define the higlight patterns and add to matches list
51- if indent_guides#getvar (' indent_guides_space_guides ' )
52- let l: soft_pattern = indent_guides#indent_highlight_pattern (indent_guides#getvar (' indent_guides_soft_pattern ' ), l: column_start , s: guide_size )
51+ if indent_guides#getvar (' space_guides ' )
52+ let l: soft_pattern = indent_guides#indent_highlight_pattern (indent_guides#getvar (' soft_pattern ' ), l: column_start , s: guide_size )
5353 call add (w: indent_guides_matches , matchadd (l: group , l: soft_pattern ))
5454 end
55- if indent_guides#getvar (' indent_guides_tab_guides ' )
55+ if indent_guides#getvar (' tab_guides ' )
5656 let l: hard_pattern = indent_guides#indent_highlight_pattern (' \t' , l: column_start , s: indent_size )
5757 call add (w: indent_guides_matches , matchadd (l: group , l: hard_pattern ))
5858 end
@@ -200,19 +200,19 @@ function! indent_guides#init_script_vars() abort
200200 let s: hi_normal = substitute (s: hi_normal , ' font=[A-Za-z0-9:]\+' , ' ' , ' ' )
201201
202202 " shortcuts to the global variables - this makes the code easier to read
203- let s: debug = indent_guides#getvar (' indent_guides_debug ' )
204- let s: indent_levels = indent_guides#getvar (' indent_guides_indent_levels ' )
205- let s: auto_colors = indent_guides#getvar (' indent_guides_auto_colors ' )
206- let s: color_hex_pat = indent_guides#getvar (' indent_guides_color_hex_pattern ' )
207- let s: color_hex_bg_pat = indent_guides#getvar (' indent_guides_color_hex_guibg_pattern ' )
208- let s: color_name_bg_pat = indent_guides#getvar (' indent_guides_color_name_guibg_pattern ' )
209- let s: start_level = indent_guides#getvar (' indent_guides_start_level ' )
203+ let s: debug = indent_guides#getvar (' debug ' )
204+ let s: indent_levels = indent_guides#getvar (' indent_levels ' )
205+ let s: auto_colors = indent_guides#getvar (' auto_colors ' )
206+ let s: color_hex_pat = indent_guides#getvar (' color_hex_pattern ' )
207+ let s: color_hex_bg_pat = indent_guides#getvar (' color_hex_guibg_pattern ' )
208+ let s: color_name_bg_pat = indent_guides#getvar (' color_name_guibg_pattern ' )
209+ let s: start_level = indent_guides#getvar (' start_level ' )
210210
211211 " str2float not available in vim versions <= 7.1
212212 if has (' float' )
213- let s: change_percent = indent_guides#getvar (' indent_guides_color_change_percent ' ) / str2float (' 100.0' )
213+ let s: change_percent = indent_guides#getvar (' color_change_percent ' ) / str2float (' 100.0' )
214214 else
215- let s: change_percent = indent_guides#getvar (' indent_guides_color_change_percent ' ) / 100.0
215+ let s: change_percent = indent_guides#getvar (' color_change_percent ' ) / 100.0
216216 endif
217217
218218 if s: debug
@@ -236,7 +236,7 @@ endfunction
236236" NOTE: Currently, this only works when soft-tabs are being used.
237237"
238238function ! indent_guides#calculate_guide_size () abort
239- let l: guide_size = indent_guides#getvar (' indent_guides_guide_size ' )
239+ let l: guide_size = indent_guides#getvar (' guide_size ' )
240240
241241 if l: guide_size == 0 || l: guide_size > s: indent_size
242242 let l: guide_size = s: indent_size
@@ -280,11 +280,11 @@ endfunction
280280" Detect if any of the buffer filetypes should be excluded.
281281"
282282function ! indent_guides#exclude_filetype () abort
283- if indent_guides#getvar (' indent_guides_exclude_buftype ' ) && &buftype !=# ' '
283+ if indent_guides#getvar (' exclude_buftype ' ) && &buftype !=# ' '
284284 return 1
285285 endif
286286 for ft in split (&ft , ' \.' , 1 )
287- if index (indent_guides#getvar (' indent_guides_exclude_filetypes ' ), ft ) > -1
287+ if index (indent_guides#getvar (' exclude_filetypes ' ), ft ) > -1
288288 return 1
289289 end
290290 endfor
@@ -297,13 +297,6 @@ endfunction
297297" return -1 if none of local buffer / global variable exists
298298"
299299function ! indent_guides#getvar (var )
300- let varName= a: var
301- if (exists (" b:" . varName))
302- exe " let retVal=b:" . varName
303- elseif (exists (" g:" . varName))
304- exe " let retVal=g:" . varName
305- else
306- exe " let retVal=-1"
307- endif
308- return retVal
300+ let l: varName = " indent_guides_" . a: var
301+ return get (b: , l: varName , get (g: , l: varName , -1 ))
309302endfunction
0 commit comments