@@ -19,7 +19,7 @@ endfunction
19
19
" other buffers and windows.
20
20
"
21
21
function ! 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 ' )
23
23
call indent_guides#enable ()
24
24
else
25
25
call indent_guides#disable ()
@@ -48,11 +48,11 @@ function! indent_guides#enable() abort
48
48
let l: column_start = (l: level - 1 ) * s: indent_size + 1
49
49
50
50
" 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 )
53
53
call add (w: indent_guides_matches , matchadd (l: group , l: soft_pattern ))
54
54
end
55
- if indent_guides#getvar (' indent_guides_tab_guides ' )
55
+ if indent_guides#getvar (' tab_guides ' )
56
56
let l: hard_pattern = indent_guides#indent_highlight_pattern (' \t' , l: column_start , s: indent_size )
57
57
call add (w: indent_guides_matches , matchadd (l: group , l: hard_pattern ))
58
58
end
@@ -200,19 +200,19 @@ function! indent_guides#init_script_vars() abort
200
200
let s: hi_normal = substitute (s: hi_normal , ' font=[A-Za-z0-9:]\+' , ' ' , ' ' )
201
201
202
202
" 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 ' )
210
210
211
211
" str2float not available in vim versions <= 7.1
212
212
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' )
214
214
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
216
216
endif
217
217
218
218
if s: debug
@@ -236,7 +236,7 @@ endfunction
236
236
" NOTE: Currently, this only works when soft-tabs are being used.
237
237
"
238
238
function ! 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 ' )
240
240
241
241
if l: guide_size == 0 || l: guide_size > s: indent_size
242
242
let l: guide_size = s: indent_size
@@ -280,11 +280,11 @@ endfunction
280
280
" Detect if any of the buffer filetypes should be excluded.
281
281
"
282
282
function ! indent_guides#exclude_filetype () abort
283
- if indent_guides#getvar (' indent_guides_exclude_buftype ' ) && &buftype !=# ' '
283
+ if indent_guides#getvar (' exclude_buftype ' ) && &buftype !=# ' '
284
284
return 1
285
285
endif
286
286
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
288
288
return 1
289
289
end
290
290
endfor
@@ -297,13 +297,6 @@ endfunction
297
297
" return -1 if none of local buffer / global variable exists
298
298
"
299
299
function ! 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 ))
309
302
endfunction
0 commit comments