Add 1.6 release log.

[etc/vim.git] / ftplugin / python_flake8.vim

diff --git a/ftplugin/python_flake8.vim b/ftplugin/python_flake8.vim
index cd6586aea19adf4b879ba71fec23d33f53229bf4..dd062d910b77876c2791b3b987d89d46c2aa66c5 100644 (file)
--- a/ftplugin/python_flake8.vim
+++ b/ftplugin/python_flake8.vim
@@ -16,23 +16,23 @@ set cpo&vim
 
 "" Highlight groups for errors
 " pep8 errors
-highlight Flake8_Error
+highlight default Flake8_Error
             \ ctermbg=DarkRed ctermfg=Red cterm=bold
             \ guibg=DarkRed   guifg=Red   gui=bold
 " pep8 warnings
-highlight Flake8_Warning
+highlight default Flake8_Warning
             \ ctermbg=Yellow ctermfg=DarkYellow cterm=bold
             \ guibg=Yellow   guifg=DarkYellow   gui=bold
 " PyFlakes codes
-highlight Flake8_PyFlake
+highlight default Flake8_PyFlake
             \ ctermbg=DarkBlue ctermfg=Blue cterm=bold
             \ guibg=DarkBlue   guifg=Blue   gui=bold
 " McCabe complexity warnings
-highlight Flake8_Complexity
+highlight default Flake8_Complexity
             \ ctermbg=DarkBlue ctermfg=Blue cterm=bold
             \ guibg=DarkBlue   guifg=Blue   gui=bold
 " naming conventions
-highlight Flake8_Naming
+highlight default Flake8_Naming
             \ ctermbg=DarkBlue ctermfg=Blue cterm=bold
             \ guibg=DarkBlue   guifg=Blue   gui=bold
 
@@ -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")
-    if !hasmapto('Flake8(')
+    if !hasmapto('Flake8(') && !hasmapto('flake8#Flake8(')
         noremap <buffer> <F7> :call flake8#Flake8()<CR>
     endif
 endif