X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/6bacdb9f616ad2a517286d40e6e7a2026b884d5e..f821f723f48521851d5e4c5546b8a4dabd3de1de:/vim/vimrc?ds=inline

diff --git a/vim/vimrc b/vim/vimrc
index e976fb8..576e984 100644
--- 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>