From 5be6a2e28191011f35200309453aa4b9cf62dc9f Mon Sep 17 00:00:00 2001
From: Roman Dobosz <gryf73@gmail.com>
Date: Thu, 1 Sep 2016 21:46:53 +0200
Subject: [PATCH] Removed pyflakes-vim, switched to my version of pythonhelper

---
 vimrc | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/vimrc b/vimrc
index 817a62b..e3bffe9 100644
--- a/vimrc
+++ b/vimrc
@@ -5,7 +5,6 @@ set nocompatible                    "VIM over VI
 
 call plug#begin('~/.vim/bundle')
 
-Plug 'Finkregh/pythonhelper'
 Plug 'Rykka/riv.vim'
 Plug 'SirVer/ultisnips'
 Plug 'Valloric/MatchTagAlways'
@@ -13,12 +12,13 @@ Plug 'davidhalter/jedi-vim'
 Plug 'ervandew/taglisttoo'
 Plug 'fs111/pydoc.vim'
 Plug 'gryf/mark'
+Plug 'gryf/pythonhelper'
 Plug 'gryf/zoom.vim'
 Plug 'hallison/vim-markdown'
 Plug 'honza/vim-snippets'
 Plug 'https://repo.or.cz/r/vcscommand.git'
 Plug 'kazuyukitanimura/jsbeautify'
-Plug 'kevinw/pyflakes-vim'
+" Plug 'kevinw/pyflakes-vim'  " deprecated, use syntastic instead
 Plug 'kien/ctrlp.vim'
 " Plug 'majutsushi/tagbar'
 Plug 'gryf/tagbar', {'branch': 'show_tag_kind2'}
@@ -52,6 +52,9 @@ Plug 'vimwiki/vimwiki'
 Plug 'will133/vim-dirdiff'
 Plug 'yegappan/grep'
 
+"in development
+Plug '~/Devel/vim/kickass-vim/'
+
 call plug#end()
 " }}}
 
@@ -160,7 +163,7 @@ autocmd BufWritePre * :call <SID>StripTrailingWhitespaces(0)
 "set correct filetype for tmux
 autocmd BufRead *.tmux.conf set filetype=tmux
 autocmd BufRead *.mako set filetype=mako
-autocmd BufRead *.ass set filetype=kickass
+autocmd BufRead *.ass, *asm set filetype=kickass
 
 " make the current line highlighted only on current window
 autocmd WinEnter * setlocal cursorline
@@ -190,6 +193,10 @@ endif
 "KickAssembler {{{2
 let g:kickass_path = '/home/gryf/c64/PCTools/Cross-assemblers/KickAssembler/KickAss.jar'
 "}}}
+" Calendar {{{2
+let g:calendar_monday = 1
+let g:calendar_weeknm = 1
+"}}}
 "CtrlP {{{2
 let g:ctrlp_custom_ignore = {
     \ 'dir': '\.git$\|\.hg$\|\.svn$',
@@ -492,8 +499,6 @@ function <SID>CreateScratch()
     new|setl bt=nofile bh=wipe nobl
     return ""
 endfunction
-
-"Toggle
 "}}}
 " GUI: detect graphics mode, set colorscheme {{{
 if has('gui_running')