remove commmand settings from config options

diff --git a/README.mdown b/README.mdown
index 34e2872edb6c04c0e254ab934ad4d34483d971e6..2f8c5b63b288bfe6bbbc73bd31d286d7222837a2 100644 (file)
--- a/README.mdown
+++ b/README.mdown
@@ -39,21 +39,9 @@ the `<F7>` key if so.  For example, to remap it to `<F3>` instead, use:
 
     autocmd FileType python map <buffer> <F3> :call Flake8()<CR>
 
 
     autocmd FileType python map <buffer> <F3> :call Flake8()<CR>
 

-To add builtins, in your .vimrc:
+For flake8 configuration options please consult the following page:

 
 

-    let g:flake8_builtins="_,apply"
-
-To ignore errors, in your .vimrc:
-
-    let g:flake8_ignore="E501,W293"
-
-If you want to change the max line length for PEP8:
-
-    let g:flake8_max_line_length=99
-
-To set the maximum [McCabe complexity](https://en.wikipedia.org/wiki/Cyclomatic_complexity) before a warning is issued:
-
-    let g:flake8_max_complexity=10
+http://flake8.readthedocs.org/en/latest/config.html

 
 To customize the location of your flake8 binary, set `g:flake8_cmd`:
 
 
 To customize the location of your flake8 binary, set `g:flake8_cmd`:
 

diff --git a/autoload/flake8.vim b/autoload/flake8.vim
index de9633e802d732064c69d2ab2903dc12a7e47a0d..b7200e6b883e1d4b109c24fdefba7a928be0f62e 100644 (file)
--- a/autoload/flake8.vim
+++ b/autoload/flake8.vim
@@ -46,11 +46,6 @@ function! s:Setup()  " {{{
 
     " flake8 command
     call s:DeclareOption('flake8_cmd', '', '"flake8"')
 
     " flake8 command
     call s:DeclareOption('flake8_cmd', '', '"flake8"')

-    " flake8 stuff
-    call s:DeclareOption('flake8_builtins',        ' --builtins=',        '')
-    call s:DeclareOption('flake8_ignore',          ' --ignore=',          '')
-    call s:DeclareOption('flake8_max_line_length', ' --max-line-length=', '')
-    call s:DeclareOption('flake8_max_complexity',  ' --max-complexity=',  '')

     " quickfix
     call s:DeclareOption('flake8_quickfix_location', '', '"belowright"')
     call s:DeclareOption('flake8_show_quickfix',     '', 1)
     " quickfix
     call s:DeclareOption('flake8_quickfix_location', '', '"belowright"')
     call s:DeclareOption('flake8_show_quickfix',     '', 1)


@@ -116,7 +111,7 @@ function! s: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.s:flake8_builtins.s:flake8_ignore.s:flake8_max_line_length.s:flake8_max_complexity
+    let &grepprg=s:flake8_cmd

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