Last fixes to b:sleuth_culprit

This commit is contained in:
Adam Stankiewicz
2020-09-09 18:07:03 +02:00
parent 2369cd5d22
commit 2dc954d6fa

View File

@@ -1887,7 +1887,6 @@ if !has_key(s:disabled_packages, 'autoindent')
return 1 return 1
endif endif
unlet b:sleuth_culprit
return 0 return 0
endfunction endfunction
@@ -1910,13 +1909,15 @@ if !has_key(s:disabled_packages, 'autoindent')
while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0 while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
" Ignore files from homedir and root " Ignore files from homedir and root
if dir == expand('~') || dir == '/' if dir == expand('~') || dir == '/'
unlet b:sleuth_culprit
return return
endif endif
for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level] for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
let b:sleuth_culprit = neighbor let b:sleuth_culprit = neighbor
" Do not consider directories above .git, .svn or .hg " Do not consider directories above .git, .svn or .hg
if fnamemodify(neighbor, ":h:t")[0] == "." if fnamemodify(neighbor, ":h:t")[0] == "."
return let level = 0
continue
endif endif
if neighbor !=# expand('%:p') && filereadable(neighbor) if neighbor !=# expand('%:p') && filereadable(neighbor)
if s:guess(readfile(neighbor, '', 32)) if s:guess(readfile(neighbor, '', 32))
@@ -1928,6 +1929,8 @@ if !has_key(s:disabled_packages, 'autoindent')
let dir = fnamemodify(dir, ':h') let dir = fnamemodify(dir, ':h')
let level -= 1 let level -= 1
endwhile endwhile
unlet b:sleuth_culprit
endfunction endfunction
setglobal smarttab setglobal smarttab