vim: show a bit more context lines in vimdiff

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 86d5bfbc85c293684283924e12fa4bb4105ff1de..3123b7e750de864cd9b27ac373e535d1a4024c00 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -172,6 +172,8 @@ set formatoptions+=r    " Insert comment leader after hitting <Enter>
 set formatoptions+=n    " Recognize numbered lists
 set formatoptions+=q    " Allow formatting of comments with "gq".
 set formatoptions+=l    " do not wrap lines that have been longer when starting insert mode already
+set formatoptions+=t    " Auto-wrap text using textwidth
+set formatoptions-=o    " Do not insert comment leader after hitting o or O in normal mode
 
 set nrformats=hex               " number formats recognized for CTRL-A and CTRL-X commands
 
@@ -180,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+=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
@@ -208,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+=context:10     " 10 lines context between changes
 
 " reading and writing files {{{2
 set modeline                    " read modelines