Merge branch 'master' into tabac-master

diff --git a/README.mdown b/README.mdown
index e1872e50e3fbb03252e5480d512a782705c4b37a..0ca6a65b60180ca79a600b3af32f5b3fcd4db1d9 100644 (file)
--- a/README.mdown
+++ b/README.mdown
@@ -51,6 +51,10 @@ To customize the location of quick fix window, set `g:flake8_quickfix_location`:
 
     let g:flake8_quickfix_location="topleft"
 
+To customize the height of quick fix window, set `g:flake8_quickfix_height`:
+
+    let g:flake8_quickfix_height=7
+
 To customize whether the quickfix window opens, set `g:flake8_show_quickfix`:
 
     let g:flake8_show_quickfix=0  " don't show

diff --git a/autoload/flake8.vim b/autoload/flake8.vim
index a958ec5d73acf9fd7c4a3d324898a0ad81e432e3..0ca4afff8b459352ab287bf4c2c9c6b964f67055 100644 (file)
--- a/autoload/flake8.vim
+++ b/autoload/flake8.vim
@@ -73,6 +73,7 @@ function! s:Setup()  " {{{
     call s:DeclareOption('flake8_cmd', '', '"flake8"')
     " 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)
@@ -155,7 +156,7 @@ function! s:Flake8()  " {{{
         " quickfix
         if !s:flake8_show_quickfix == 0
             " open cwindow
-            execute s:flake8_quickfix_location." copen"
+            execute s:flake8_quickfix_location." copen".s:flake8_quickfix_height
             setlocal wrap
             nnoremap <buffer> <silent> c :cclose<CR>
             nnoremap <buffer> <silent> q :cclose<CR>