From: Vincent Driessen <vincent@3rdcloud.com>
Date: Mon, 15 Dec 2014 08:26:41 +0000 (+0100)
Subject: Merge branch 'master' into tabac-master
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/6cc5173536139551c5aa5cb3a4a35678f04caf1f?ds=sidebyside;hp=--cc

Merge branch 'master' into tabac-master
---

6cc5173536139551c5aa5cb3a4a35678f04caf1f
diff --cc autoload/flake8.vim
index 5c54ad1,a958ec5..0ca4aff
--- a/autoload/flake8.vim
+++ b/autoload/flake8.vim
@@@ -46,14 -71,8 +71,9 @@@ function! s:Setup()  " {{
  
      " 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_quickfix_height',     '', 5)
      call s:DeclareOption('flake8_show_quickfix',     '', 1)
      " markers to show
      call s:DeclareOption('flake8_show_in_gutter', '',   0)