1
0
mirror of https://github.com/gryf/.vim.git synced 2025-12-17 19:40:29 +01:00

Merge with changes

This commit is contained in:
2016-09-01 21:50:34 +02:00
2 changed files with 7 additions and 1 deletions

View File

@@ -33,6 +33,11 @@ let g:pyflakes_use_quickfix = 0
autocmd BufWinLeave *.py mkview autocmd BufWinLeave *.py mkview
autocmd BufWinEnter *.py silent loadview autocmd BufWinEnter *.py silent loadview
"Something bad happens for python comments - it places 2 spaces instead of 1
"after the # sign. Workaround:
let g:NERDCustomDelimiters = {'python': {'left': '#'}}
let g:NERDSpaceDelims = 0
finish "end here. all below is just for the record. finish "end here. all below is just for the record.
" Pylint function, which can be optionally mapped to some keys. Currently " Pylint function, which can be optionally mapped to some keys. Currently

3
vimrc
View File

@@ -13,6 +13,7 @@ Plug 'ervandew/taglisttoo'
Plug 'fs111/pydoc.vim' Plug 'fs111/pydoc.vim'
Plug 'gryf/mark' Plug 'gryf/mark'
Plug 'gryf/pythonhelper' Plug 'gryf/pythonhelper'
Plug 'gryf/tagbar', {'branch': 'show_tag_kind2'}
Plug 'gryf/zoom.vim' Plug 'gryf/zoom.vim'
Plug 'hallison/vim-markdown' Plug 'hallison/vim-markdown'
Plug 'honza/vim-snippets' Plug 'honza/vim-snippets'
@@ -21,7 +22,6 @@ Plug 'kazuyukitanimura/jsbeautify'
" Plug 'kevinw/pyflakes-vim' " deprecated, use syntastic instead " Plug 'kevinw/pyflakes-vim' " deprecated, use syntastic instead
Plug 'kien/ctrlp.vim' Plug 'kien/ctrlp.vim'
" Plug 'majutsushi/tagbar' " Plug 'majutsushi/tagbar'
Plug 'gryf/tagbar', {'branch': 'show_tag_kind2'}
Plug 'mattn/calendar-vim' Plug 'mattn/calendar-vim'
Plug 'mduan/python.vim' Plug 'mduan/python.vim'
Plug 'mikeage/occur.vim' Plug 'mikeage/occur.vim'
@@ -30,6 +30,7 @@ Plug 'myhere/vim-nodejs-complete'
Plug 'othree/html5.vim' Plug 'othree/html5.vim'
Plug 'pangloss/vim-javascript' Plug 'pangloss/vim-javascript'
Plug 'pcaro90/jpythonfold.vim' Plug 'pcaro90/jpythonfold.vim'
Plug 'rust-lang/rust.vim'
Plug 'scrooloose/nerdcommenter' Plug 'scrooloose/nerdcommenter'
Plug 'scrooloose/nerdtree' Plug 'scrooloose/nerdtree'
Plug 'scrooloose/syntastic' Plug 'scrooloose/syntastic'