Merge branch 'master' of 76.182.74.61:stonewareslord/Sync

This commit is contained in:
Austen Adler 2014-05-04 14:12:07 -04:00
commit 45b188bdb0

4
vimrc
View File

@ -58,7 +58,6 @@ nnoremap j gj
nnoremap k gk
nnoremap H ^
nnoremap L $
nnoremap Y y$
nnoremap <C-h> <C-w>h
nnoremap <C-j> <C-w>j
nnoremap <C-k> <C-w>k
@ -210,3 +209,6 @@ else
endif
colorscheme torte
endif
nnoremap Y y$
nnoremap <Leader>W :%s/\s\+$//<cr>:let @/=''<cr>
nnoremap <Leader>H *<C-O>:AckFromSearch!<CR>