Merge pull request #73 from antoinemadec/cclose_after_grep

[etc/vim.git] / autoload / flake8.vim

diff --git a/autoload/flake8.vim b/autoload/flake8.vim
index 06a1b6b4873a78bd3a70540376593359a53730c7..d21664ea5f16ebecaeadaefa9770eb8fe7277732 100644 (file)
--- a/autoload/flake8.vim
+++ b/autoload/flake8.vim
@@ -109,8 +109,10 @@ function! s:Flake8()  " {{{
     " read config
     call s:Setup()
 
-    if !executable(s:flake8_cmd)
-        echoerr "File " . s:flake8_cmd . " not found. Please install it first."
+    let l:executable = split(s:flake8_cmd)[0]
+
+    if !executable(l:executable)
+        echoerr "File " . l:executable . " not found. Please install it first."
         return
     endif
 
@@ -130,7 +132,6 @@ function! s:Flake8()  " {{{
     endif
 
     set lazyredraw   " delay redrawing
-    cclose           " close any existing cwindows
 
     " set shellpipe to > instead of tee (suppressing output)
     set shellpipe=>
@@ -139,6 +140,9 @@ function! s:Flake8()  " {{{
     let &grepformat="%f:%l:%c: %m\,%f:%l: %m"
     let &grepprg=s:flake8_cmd
     silent! grep! "%"
+    " close any existing cwindows,
+    " placed after 'grep' in case quickfix is open on autocmd QuickFixCmdPost
+    cclose
 
     " restore grep settings
     let &grepformat=l:old_gfm