From: Vincent Driessen <vincent@3rdcloud.com>
Date: Fri, 13 Jul 2012 13:19:31 +0000 (-0700)
Subject: Merge pull request #11 from gwrtheyrn/max_line_length
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/ca1dc6d3ef003f7e44eec46231779cb18009c88d?hp=3b154262d17fa1430919c60c22af8b33dde7ab03

Merge pull request #11 from gwrtheyrn/max_line_length

Configuration variable for max-line-length. Nice addition, thanks!
---

diff --git a/README.mdown b/README.mdown
index 99ef175..0694399 100644
--- a/README.mdown
+++ b/README.mdown
@@ -32,6 +32,18 @@ the `<F7>` key if so.  For example, to remap it to `<F3>` instead, use:
 
     autocmd FileType python map <buffer> <F3> :call Flake8()<CR>
 
+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 cutomize the location of your flake8 binary, set `g:flake8_cmd`:
+
+    let g:flake8_cmd="/opt/strangebin/flake8000"
+
 
 Tips
 ----
@@ -41,14 +53,6 @@ enable this, add the following line to your `.vimrc` file (thanks
 
     autocmd BufWritePost *.py call Flake8()
 
-To ignore errors, in your .vimrc:
-
-    let g:flake8_ignore="E501,W293"
-
-If you want to cutomize the location of your flake8 binary, set `g:flake8_cmd`:
-
-    let g:flake8_cmd="/opt/strangebin/flake8000"
-
 This plugin goes well together with the following plugin:
 
 - [PyUnit](http://github.com/nvie/vim-pyunit) (unit test helper under `<F8>`
diff --git a/ftplugin/python_flake8.vim b/ftplugin/python_flake8.vim
index 52d9fdf..e3b3c61 100644
--- a/ftplugin/python_flake8.vim
+++ b/ftplugin/python_flake8.vim
@@ -22,6 +22,11 @@ if exists("g:flake8_ignore")
     let s:flake8_ignores=" --ignore=".g:flake8_ignore
 endif
 
+let s:flake8_max_line_length=""
+if exists("g:flake8_max_line_length")
+    let s:flake8_max_line_length=" --max-line-length=".g:flake8_max_line_length
+endif
+
 if !exists("*Flake8()")
     function Flake8()
         if !executable(s:flake8_cmd)
@@ -43,7 +48,7 @@ if !exists("*Flake8()")
 
         " perform the grep itself
         let &grepformat="%f:%l:%c: %m\,%f:%l: %m"
-        let &grepprg=s:flake8_cmd.s:flake8_ignores
+        let &grepprg=s:flake8_cmd.s:flake8_ignores.s:flake8_max_line_length
         silent! grep! %
 
         " restore grep settings