From 1d072bf0199f39e4b0711a3952248f318d8ec63f Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Tue, 9 Feb 2016 20:16:12 +0100 Subject: [PATCH] Do not check for mixed whitespace in Makefiles Skip indent and mixed-indent-file check for Makefiles. fixes #1017 --- autoload/airline/extensions/whitespace.vim | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/autoload/airline/extensions/whitespace.vim b/autoload/airline/extensions/whitespace.vim index 0d984d0c..fbd241ca 100644 --- a/autoload/airline/extensions/whitespace.vim +++ b/autoload/airline/extensions/whitespace.vim @@ -12,6 +12,7 @@ let s:mixed_indent_format = get(g:, 'airline#extensions#whitespace#mixed_indent_ let s:long_format = get(g:, 'airline#extensions#whitespace#long_format', 'long[%s]') let s:mixed_indent_file_format = get(g:, 'airline#extensions#whitespace#mixed_indent_file_format', 'mix-indent-file[%s]') let s:indent_algo = get(g:, 'airline#extensions#whitespace#mixed_indent_algo', 0) +let s:skip_check_ft = {'make': ['indent', 'mixed-indent-file'] } let s:max_lines = get(g:, 'airline#extensions#whitespace#max_lines', 20000) @@ -65,12 +66,14 @@ function! airline#extensions#whitespace#check() endif let mixed = 0 - if index(checks, 'indent') > -1 + let check = 'indent' + if index(checks, check) > -1 && index(get(s:skip_check_ft, &ft, []), check) < 0 let mixed = s:check_mixed_indent() endif let mixed_file = '' - if index(checks, 'mixed-indent-file') > -1 + let check = 'mixed-indent-file' + if index(checks, check) > -1 && index(get(s:skip_check_ft, &ft, []), check) < 0 let mixed_file = s:check_mixed_indent_file() endif