Mercurial > dotfiles
changeset 159:9c1c2ffcc7e2
Merged changes.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Mon, 16 Dec 2013 16:40:42 -0800 |
| parents | 063afe08c251 (current diff) fad6de4a0252 (diff) |
| children | 5997455e475b |
| files | .hgsubstate |
| diffstat | 4 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Thu Nov 28 11:56:40 2013 -0800 +++ b/.hgsub Mon Dec 16 16:40:42 2013 -0800 @@ -19,6 +19,8 @@ vim/bundle/fugitive = [git]https://github.com/tpope/vim-fugitive.git vim/bundle/syntastic = [git]https://github.com/scrooloose/syntastic.git vim/bundle/less = [git]https://github.com/groenewege/vim-less.git +vim/bundle/twig = [git]https://github.com/beyondwords/vim-twig.git +vim/bundle/tagbar = [git]https://github.com/majutsushi/tagbar.git vim/bundle/lawrencium = https://bitbucket.org/ludovicchabant/vim-lawrencium vim/bundle/piecrust = https://bitbucket.org/ludovicchabant/vim-piecrust
--- a/.hgsubstate Thu Nov 28 11:56:40 2013 -0800 +++ b/.hgsubstate Mon Dec 16 16:40:42 2013 -0800 @@ -20,5 +20,7 @@ 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized 7a32e0866bfea26cf7781935289df131d1d0c0e0 vim/bundle/supertab 42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a vim/bundle/surround -fa2e6b96d928e610b06f2e2936b6f4dc7535a1d9 vim/bundle/syntastic +94f710dddedef870736d7c55b387788b9a0afeda vim/bundle/syntastic +6d8770f949b8bd5160e65a7fc8ebce588e3b4736 vim/bundle/tagbar +869c05195086dd1af9fe39e49621f9f880b6f07c vim/bundle/twig b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom
--- a/vim/vimrc Thu Nov 28 11:56:40 2013 -0800 +++ b/vim/vimrc Mon Dec 16 16:40:42 2013 -0800 @@ -221,14 +221,14 @@ " Ctrl-P should however ignore some stuff. let g:ctrlp_custom_ignore = { - \ 'dir': '\v[\/](\.git|\.hg|\.svn|venv|build)$' + \ 'dir': '\v[\/](\.git|\.hg|\.svn|venv|node_modules|build)$' \ } " Make Ctrl-P cache stuff in our temp directory. let g:ctrlp_cache_dir = s:vim_home.'/cache' " Use `pyflakes` with `syntastic`. -let g:syntastic_python_checker = 'pyflakes' +let g:syntastic_python_checkers = ['pyflakes'] " Custom Mercurial commands highlighting in Lawrencium. let g:lawrencium_hg_commands_file_types = { @@ -289,6 +289,9 @@ " Switch buffers. nnoremap <F3> :execute ("buffer " . bufname("#"))<cr> +" Tagbar. +nnoremap <F8> :TagbarToggle<cr> + " Common typos. nnoremap ; :
--- a/vimperatorrc Thu Nov 28 11:56:40 2013 -0800 +++ b/vimperatorrc Mon Dec 16 16:40:42 2013 -0800 @@ -39,6 +39,9 @@ " Quickly hide search highlighting nnoremap <leader><Space> :noh<cr> +" Quickly open some dialogs +nnoremap <leader>b :downloads<cr> + " Super minimal UI set toolbars=noaddons,nobookmarks,nomenu,nonavigation,notabs