summaryrefslogtreecommitdiffstats
path: root/.vimrc
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2013-05-01 22:22:41 +0200
committerFlorian Pritz <bluewind@xinu.at>2013-05-01 22:22:41 +0200
commit8bcb0213177a6d2cef8b6b6728076749ce36a22b (patch)
treea106b112e7fc4780ce90367c0744b6e5625ea40b /.vimrc
parentaaf5d32b0688d1064d46bf7a74775a3ab1aa8830 (diff)
downloaddotfiles-8bcb0213177a6d2cef8b6b6728076749ce36a22b.tar.gz
dotfiles-8bcb0213177a6d2cef8b6b6728076749ce36a22b.tar.xz
vim: switch ti ultisnips; update some plugins
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.vimrc')
-rw-r--r--.vimrc5
1 files changed, 5 insertions, 0 deletions
diff --git a/.vimrc b/.vimrc
index f512f04..f383bd1 100644
--- a/.vimrc
+++ b/.vimrc
@@ -51,6 +51,7 @@ call vundle#rc()
Bundle 'scrooloose/syntastic'
Bundle 'Valloric/YouCompleteMe'
+Bundle 'SirVer/ultisnips'
filetype plugin indent on
@@ -106,6 +107,10 @@ inoremap <C-f> <ESC>:FufFile<CR>
noremap <C-h> :nohl<CR>
inoremap <C-h> <ESC>:nohl<CR>a
+let g:UltiSnipsExpandTrigger="<c-j>"
+let g:UltiSnipsJumpForwardTrigger="<c-j>"
+let g:UltiSnipsJumpBackwardTrigger="<c-k>"
+
nmap <silent> ,s :set spell!<CR>
autocmd FileType make setlocal noexpandtab