Cleanup.

diff --git a/README.mdown b/README.mdown
index e6d0f109edb62ceb09f2db259f05fc70e16472cf..5b83c992e68f2090f39c9f5163888f99f8060b0d 100644 (file)
--- a/README.mdown
+++ b/README.mdown
@@ -119,7 +119,7 @@ This plugin goes well together with the following plugin:
 History
 -------
 
 History
 -------
 

-1.4: Added markers and the option to don't show the quickfix window, also split functions into
+1.5: Added markers and the option to don't show the quickfix window, also split functions into

 a autoload file. Added:
 
     - Options:
 a autoload file. Added:
 
     - Options:


@@ -142,6 +142,8 @@ a autoload file. Added:
       - `Flake8_Naming`
       - `Flake8_PyFlake`
 
       - `Flake8_Naming`
       - `Flake8_PyFlake`
 

+1.4: Suppress output to stdout.
+

 1.3: Added the following options:
 
     - `g:flake8_builtins="_,apply"`
 1.3: Added the following options:
 
     - `g:flake8_builtins="_,apply"`

diff --git a/autoload/flake8.vim b/autoload/flake8.vim
index 7ef2373decd31d8f102e5fc08f718fab0cd71ce8..6aee19c27dc496b4a9f533fee9782a0ff098b0fd 100644 (file)
--- a/autoload/flake8.vim
+++ b/autoload/flake8.vim
@@ -203,7 +203,6 @@ function! s:PlaceMarkers(results)  " {{{
             let l:index += 1
         endif
     endfor
             let l:index += 1
         endif
     endfor

-    redraw

 endfunction  " }}}
 
 function! s:UnplaceMarkers()  " {{{
 endfunction  " }}}
 
 function! s:UnplaceMarkers()  " {{{

diff --git a/ftplugin/python_flake8.vim b/ftplugin/python_flake8.vim
index c4655bce02a97f521449949a7f127805e1b80045..dd062d910b77876c2791b3b987d89d46c2aa66c5 100644 (file)
--- a/ftplugin/python_flake8.vim
+++ b/ftplugin/python_flake8.vim
@@ -45,7 +45,7 @@ endfunction
 " The default mapping is registered under to <F7> by default, unless the user
 " remapped it already (or a mapping exists already for <F7>)
 if !exists("no_plugin_maps") && !exists("no_flake8_maps")
 " The default mapping is registered under to <F7> by default, unless the user
 " remapped it already (or a mapping exists already for <F7>)
 if !exists("no_plugin_maps") && !exists("no_flake8_maps")

-    if !hasmapto('Flake8(')
+    if !hasmapto('Flake8(') && !hasmapto('flake8#Flake8(')

         noremap <buffer> <F7> :call flake8#Flake8()<CR>
     endif
 endif
         noremap <buffer> <F7> :call flake8#Flake8()<CR>
     endif
 endif