Merge pull request #8 from alanbriolat/master

[etc/vim.git] / ftplugin / python_flake8.vim

diff --git a/ftplugin/python_flake8.vim b/ftplugin/python_flake8.vim
index bd2c0b935e6b31362278a0f44dfd1d210885c24b..d1ece6162e3d964bcdeba7f2c2fda0ff1dba86ec 100644 (file)
--- a/ftplugin/python_flake8.vim
+++ b/ftplugin/python_flake8.vim
@@ -13,6 +13,11 @@ let b:loaded_flake8_ftplugin=1
 
 let s:flake8_cmd="flake8"
 
 
 let s:flake8_cmd="flake8"
 

+let s:flake8_ignores=""
+if exists("g:flake8_ignore")
+    let s:flake8_ignores=" --ignore=".g:flake8_ignore
+endif
+

 if !exists("*Flake8()")
     function Flake8()
         if !executable(s:flake8_cmd)
 if !exists("*Flake8()")
     function Flake8()
         if !executable(s:flake8_cmd)


@@ -34,7 +39,7 @@ if !exists("*Flake8()")
 
         " perform the grep itself
         let &grepformat="%f:%l:%c: %m\,%f:%l: %m"
 
         " perform the grep itself
         let &grepformat="%f:%l:%c: %m\,%f:%l: %m"

-        let &grepprg=s:flake8_cmd
+        let &grepprg=s:flake8_cmd.s:flake8_ignores

         silent! grep! %
 
         " restore grep settings
         silent! grep! %
 
         " restore grep settings


@@ -69,6 +74,5 @@ endif
 if !exists("no_plugin_maps") && !exists("no_flake8_maps")
     if !hasmapto('Flake8(')
         noremap <buffer> <F7> :call Flake8()<CR>
 if !exists("no_plugin_maps") && !exists("no_flake8_maps")
     if !hasmapto('Flake8(')
         noremap <buffer> <F7> :call Flake8()<CR>

-        noremap! <buffer> <F7> :call Flake8()<CR>

     endif
 endif
     endif
 endif