vim: show a bit more context lines in vimdiff

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 8160348d9a899b53ef50a93d7843708f657b6263..3123b7e750de864cd9b27ac373e535d1a4024c00 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -182,6 +182,8 @@ set complete+=w      " scan buffers from other windows
 set complete+=b      " scan other loaded buffers that are in the buffer list
 set complete+=u      " scan the unloaded buffers that are in the buffer list
 set complete+=t      " scan tags
 set complete+=b      " scan other loaded buffers that are in the buffer list
 set complete+=u      " scan the unloaded buffers that are in the buffer list
 set complete+=t      " scan tags

+set complete+=i      " scan current and included files
+set complete+=kspell " use the currently active spell checking |spell|

 
 " whether to use a popup menu for Insert mode completion
 set completeopt=longest,menuone,preview
 
 " whether to use a popup menu for Insert mode completion
 set completeopt=longest,menuone,preview


@@ -210,6 +212,7 @@ set viewoptions=cursor          " only save cursor position
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split
 set diffopt+=iwhite         " ignore white space
 set diffopt+=filler         " show filler lines
 set diffopt+=vertical       " always vertical split
 set diffopt+=iwhite         " ignore white space

+set diffopt+=context:10     " 10 lines context between changes

 
 " reading and writing files {{{2
 set modeline                    " read modelines
 
 " reading and writing files {{{2
 set modeline                    " read modelines