Hotfixes to improve compatibility with python

8 files changed, 33 insertions, 15 deletions

diff --git a/plugin/KarlMarks.vim b/plugin/KarlMarks.vim
index 3340dad..f0699e1 100644
--- a/plugin/KarlMarks.vim
+++ b/plugin/KarlMarks.vim
@@ -8,19 +8,19 @@ let g:markerbar_additional .=  "^"   " insert mode stopped
 let g:markerbar_additional .=  "'`"
 
 function! KarlMarks()
-    for c in map(split(g:markerbar_additional, '\zs'), "char2nr(v:val)") + 
+    for c in map(split(g:markerbar_additional, '\zs'), "char2nr(v:val)") +
                 \ range(char2nr('a'), char2nr('z')) +
                 \ range(char2nr('A'), char2nr('Z')) +
                 \ range(char2nr('0'), char2nr('9'))
 
-        let p = getpos("'".nr2char(c)) 
+        let p = getpos("'".nr2char(c))
 
-        if (p[0] == 0 || p[0] == winbufnr(0)) && p[1] > 0 
+        if (p[0] == 0 || p[0] == winbufnr(0)) && p[1] > 0
             exec "sign unplace ".c
             exec "sign define mark_".c." text=".nr2char(c)." texthl=SignColumn"
             exec "sign place ".c." name=mark_".c." line=".p[1]." buffer=".winbufnr(0)
-        endif  
-    endfor 
+        endif
+    endfor
 endfunction
 
 autocmd CursorHold * call KarlMarks()
diff --git a/plugin/ale.vim b/plugin/ale.vim
new file mode 100644
index 0000000..ba07343
--- /dev/null
+++ b/plugin/ale.vim
@@ -0,0 +1,8 @@
+let g:ale_pattern_options = {'\.py$': {'ale_enabled': 1}}
+let g:ale_linters = {'python': ['flake8', 'pylint'] }
+let g:ale_fixers =
+    \ {
+    \   'python': ['black', 'isort', 'remove_trailing_lines', 'trim_whitespace'],
+    \   'bash': ['remove_trailing_lines', 'trim_whitespace']
+    \ }
+
diff --git a/plugin/fix-pumvisible-no-newline.vim b/plugin/fix-pumvisible-no-newline.vim
new file mode 100644
index 0000000..ad27182
--- /dev/null
+++ b/plugin/fix-pumvisible-no-newline.vim
@@ -0,0 +1 @@
+imap <expr> <CR> pumvisible() ? "\<C-y>" : "\<CR>"
diff --git a/plugin/max-fix-colorschemes.vim b/plugin/max-fix-colorschemes.vim
index b9c7657..c0f091d 100644
--- a/plugin/max-fix-colorschemes.vim
+++ b/plugin/max-fix-colorschemes.vim
@@ -21,12 +21,11 @@ function! ExtendColorTheme()
     highlight! link  WildMenu     Search
     highlight! link  Convention   Error
     highlight! link  PmenuSbar    Pmenu
-    highlight! link  Tabline      StatusLine
     highlight! link  VertSplit    LineNr
     highlight! link  SignColumn   LineNr
     highlight! link  FoldColumn   VertSplit
     " highlight! link  Folded       LineNr
-    highlight! link  EndOfBuffer  LineNr
+    highlight! link  EndOfBuffer  NonText
 endfunction
 autocmd ColorScheme * call ExtendColorTheme()
 
@@ -36,8 +35,8 @@ else
     set termguicolors
 endif
 
-if filereadable(expand('~/.vimrc_background')) && filereadable(expand('~/.config/base16-shell/colortest'))
-    let g:base16_shell_path  =  '~/.config/base16-shell/scripts'
+if filereadable(expand('~/.vimrc_background')) && filereadable(expand('~/.local/share/base16/base16-shell/colortest'))
+    let g:base16_shell_path  =  '~/.local/share/base16/base16-shell/scripts'
     let base16colorspace     =  256
     source ~/.vimrc_background
 else
@@ -52,6 +51,7 @@ else
                 \   }
                 \ }
     colorscheme PaperColor
+    set background=dark
 endif
 
 
diff --git a/plugin/max-function-menu.vim b/plugin/max-function-menu.vim
index 6c7308a..b981997 100644
--- a/plugin/max-function-menu.vim
+++ b/plugin/max-function-menu.vim
@@ -81,7 +81,7 @@ augroup MAX_FUNCTION_MENU
         menu &Git.&Display\ recently\ changed\ files\ in\ quickfix\ list
                     \ :call setqflist([], 'r', {'title': 'Recently changed in GIT', 'items':map(systemlist("git show --name-only --pretty=''"), {_, p->{'filename': fnamemodify(p, ':.')}}) })<CR>:copen<CR>
         menu &Git.&Display\ last\ changes
-                    \ :let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f'}<CR>:SignifyRefresh<CR>
+                    \ :let g:signify_vcs_cmds={'git': 'git diff --no-color --no-ext-diff -U0 HEAD^ -- %f', 'svn': '', 'cvs': ''}<CR>:SignifyRefresh<CR>
         menu &Git.&Display\ unmerged\ files\ in\ location\ list
                     \ :call setloclist(0, map(systemlist("git diff --name-only --diff-filter=U \| uniq"), {_, p->{'filename': fnamemodify(p, ':.')}}))<CR>:lopen<CR>
         menu &Git.&Display\ significance\ of\ changes
diff --git a/plugin/signify.vim b/plugin/signify.vim
index 5eeb2b0..9edc3c5 100644
--- a/plugin/signify.vim
+++ b/plugin/signify.vim
@@ -29,7 +29,7 @@ augroup SIGNIFY
     highlight! link            SignifySignDeleteFirstLine  SignColumn
   endfunction
 
-  packadd vim-signify
+  " packadd vim-signify
 
   autocmd VimEnter,ColorScheme * call SignifyColorScheme()
 augroup END
diff --git a/plugin/statusline.vim b/plugin/statusline.vim
index e6f175d..57fbfa4 100644
--- a/plugin/statusline.vim
+++ b/plugin/statusline.vim
@@ -14,18 +14,17 @@ augroup MAX_FANCYLINE
     if &term ==? 'linux'
         let g:group_active         = 'StatusLineTerm'
         let g:group_inactive       = 'StatusLineTermNC'
-        let g:group_tabline        = 'StatusLineTerm'
+        let g:group_tabline        = 'TabLine'
     else
         let g:group_active         = 'StatusLine'
         let g:group_inactive       = 'StatusLineNC'
-        " let g:group_tabline        = 'TabLine'
-        let g:group_tabline        = 'StatusLine'
+        let g:group_tabline        = 'TabLine'
     endif
 
     " this function reverts foreground color and background color of a given
     " highlight group and returns the name of a newly created _invert group
     function! CreateInvertGroup(highlight_group)
-        if(synIDattr(hlID(a:highlight_group), 'reverse')==1)
+        if(synIDattr(synIDtrans(hlID(a:highlight_group)), 'reverse', 'cterm')==1)
             let w:color=synIDattr(hlID(a:highlight_group), 'fg#')
         else
             let w:color=synIDattr(hlID(a:highlight_group), 'bg#')
@@ -124,6 +123,12 @@ augroup MAX_FANCYLINE
                     \ .'%##'
     endfunction
 
+
+    if $USER ==? 'root'
+        let invert_group = CreateInvertGroup("ErrorMsg")
+        let g:group_tabline = invert_group
+    endif
+
     function! ApplyColorScheme()
         " set termguicolors | " When on, uses highlight-guifg and highlight-guibg attributes in the terminal (=24bit color) incompatible with nvim
         " set t_ut=
diff --git a/plugin/vimdiff.vim b/plugin/vimdiff.vim
new file mode 100644
index 0000000..ffd9f46
--- /dev/null
+++ b/plugin/vimdiff.vim
@@ -0,0 +1,4 @@
+if &diff                             " only for diff mode/vimdiff
+  set diffopt=filler,context:1000000 " filler is default and inserts empty lines for sync
+  set foldmethod=syntax
+endif