vim: gk and gj movement

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index e976fb8a87841927d5abf8bf1b1baa9b0c4cace4..576e984fe2b6035a6ebf2ada50e514ae2aeaad2a 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -158,6 +158,9 @@ set foldlevelstart=0            " value for 'foldlevel' when starting to edit a
 " save and restore folds
 set viewoptions=folds,cursor    " don't save local options
 
+" diff mode {{{2
+set diffopt=filler,vertical
+
 " reading and writing files {{{2
 set modeline                    " read modelines
 set modelines=2                 " only check first/last 2 lines
@@ -308,6 +311,10 @@ inoremap <c-e> <esc>A
 cnoremap <c-a> <home>
 cnoremap <c-e> <end>
 
+" proper movement when lines are wrapped
+noremap j gj
+noremap k gk
+
 " disable arrows
 noremap  <Up>    <NOP>
 noremap  <Down>  <NOP>