Merge pull request #74 from UbiCastTeam/master

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

diff --git a/autoload/flake8.vim b/autoload/flake8.vim
index 06a1b6b4873a78bd3a70540376593359a53730c7..cf592cf7247764fcbe504101123ec695b048b53d 100644 (file)
--- a/autoload/flake8.vim
+++ b/autoload/flake8.vim
@@ -109,8 +109,10 @@ function! s:Flake8()  " {{{
     " read config
     call s:Setup()
 
     " 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
 
         return
     endif
 


@@ -123,6 +125,8 @@ function! s:Flake8()  " {{{
     let l:old_gfm=&grepformat
     let l:old_gp=&grepprg
     let l:old_shellpipe=&shellpipe
     let l:old_gfm=&grepformat
     let l:old_gp=&grepprg
     let l:old_shellpipe=&shellpipe

+    let l:old_t_ti=&t_ti
+    let l:old_t_te=&t_te

 
     " write any changes before continuing
     if &readonly == 0
 
     " write any changes before continuing
     if &readonly == 0


@@ -130,20 +134,26 @@ function! s:Flake8()  " {{{
     endif
 
     set lazyredraw   " delay redrawing
     endif
 
     set lazyredraw   " delay redrawing

-    cclose           " close any existing cwindows

 
 

-    " set shellpipe to > instead of tee (suppressing output)
+    " prevent terminal from blinking

     set shellpipe=>
     set shellpipe=>

+    set t_ti=
+    set t_te=

 
     " perform the grep itself
     let &grepformat="%f:%l:%c: %m\,%f:%l: %m"
     let &grepprg=s:flake8_cmd
     silent! grep! "%"
 
     " perform the grep itself
     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
     let &grepprg=l:old_gp
     let &shellpipe=l:old_shellpipe
 
     " restore grep settings
     let &grepformat=l:old_gfm
     let &grepprg=l:old_gp
     let &shellpipe=l:old_shellpipe

+    let &t_ti=l:old_t_ti
+    let &t_te=l:old_t_te

 
     " process results
     let l:results=getqflist()
 
     " process results
     let l:results=getqflist()