dotfiles

commit f1cee9985c3cdb3d7548b7ac0567781e02049dfb
parent 58fb205e2f710d8aa6d5059f77d5965f8566e50b
Author: Ed van Bruggen <edvb54@gmail.com>
Date:   Thu, 31 Jul 2014 14:25:45 -0700

Merge branch 'master' of https://github.com/edvb54/dotfiles

Diffstat:
vim/bundle/fzf
 | 
2
+-
vim/bundle/neosnippet
 | 
2
+-
vim/bundle/neosnippet-snippets
 | 
2
+-
vim/bundle/vim-easy-align
 | 
2
+-
vim/bundle/vim-fugitive
 | 
2
+-
vim/bundle/vim-gitgutter
 | 
2
+-
vim/bundle/vim-pencil
 | 
2
+-
vim/bundle/vim-snippets
 | 
2
+-
vimrc
 | 
6
+++---

9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/vim/bundle/fzf b/vim/bundle/fzf
@@ -1 +1 @@
-Subproject commit 3e91c189aea13472ee1f2757482507c24b9e1ff5
+Subproject commit de0965619716d7222ee0ff17cf8ef1a37f2fd861
diff --git a/vim/bundle/neosnippet b/vim/bundle/neosnippet
@@ -1 +1 @@
-Subproject commit 8d61e62a65e7f0c278e02f3624cee535ecc11bec
+Subproject commit 578530edf1a85a623b7915cd2904407081cadf36
diff --git a/vim/bundle/neosnippet-snippets b/vim/bundle/neosnippet-snippets
@@ -1 +1 @@
-Subproject commit 16570a91d81ea9c6dd7286a0579640ffea4e7d88
+Subproject commit 5571cf0c8f05204fafceb5aeafe2716ce91737cc
diff --git a/vim/bundle/vim-easy-align b/vim/bundle/vim-easy-align
@@ -1 +1 @@
-Subproject commit f9a49e441d26276f247650edc359f3c85def4270
+Subproject commit fc9555cd659586d10e767d56794699ba96dd5278
diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 0cd33c617006a07331bf45c0970e3d4e82680f6a
+Subproject commit 416165f0630f683b859fd56161183ca3d6eecc44
diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter
@@ -1 +1 @@
-Subproject commit fed2dbad3455f18d11d602a42a37233dab8d448b
+Subproject commit c9595f22e82e0c65b3267f39ff815a68f69e636a
diff --git a/vim/bundle/vim-pencil b/vim/bundle/vim-pencil
@@ -1 +1 @@
-Subproject commit 8269202e82f547e466c732ca0d0c67719abe7fda
+Subproject commit 84b66f57b557d523451330f0d122ff055dffd074
diff --git a/vim/bundle/vim-snippets b/vim/bundle/vim-snippets
@@ -1 +1 @@
-Subproject commit c3db5beee984402483afcfa83c6c6cc7131f316d
+Subproject commit 45bcd32d596ef9db84919d7a1fcb20e4c920cf92
diff --git a/vimrc b/vimrc
@@ -77,8 +77,8 @@ nmap <silent> <C-o>  <Plug>GoldenViewSplit
 nmap <silent> <F8>   <Plug>GoldenViewSwitchMain
 
 " Neocomplete tab to select
-" inoremap <expr><TAB>  pumvisible() ? "\<Down>" : "\<C-x>\<C-u>"
 imap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
+imap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<S-TAB>"
 inoremap <expr><Left>  neocomplete#close_popup() . "\<Left>"
 inoremap <expr><Right> neocomplete#close_popup() . "\<Right>"
 inoremap <expr><Up>    neocomplete#close_popup() . "\<Up>"
@@ -246,7 +246,7 @@ nnoremap ZS :w<CR>
 inoremap jj <Esc>
 
 " make ctrl+c completely like ESC
-inoremap <C-c> <Esc>
+inoremap <C-c> <Esc><Esc>
 
 " C changes until end of line and D deletes until end of line, so why not Y?
 noremap Y y$
@@ -274,7 +274,7 @@ inoremap [<CR> [<CR>]<Esc>O
 inoremap [[    [
 inoremap []    []
 
-inoremap <<    <><Left>
+inoremap <>    <><Left>
 inoremap ""    ""<Left>
 inoremap ''    ''<Left>
 inoremap ``    ``<Left>