X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=374c426930ad9a227847879478248d7eb4719260;hb=174ef8c368e86bd89add90a27cf875b2685e3f94;hp=496858e0599266281548e3311de6ba26ae4af050;hpb=b286ba313d2c69c2676e39241e6ae4ddfd888dc5;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 496858e..374c426 100644
--- a/vimrc
+++ b/vimrc
@@ -52,9 +52,18 @@ set nojoinspaces
 " Allow backspacing over autoindent, line breaks and insert mode starts.
 set backspace=indent,eol,start
 
+" Start a comment when hitting enter after a commented line (r) and when using
+" o or O around a commented line (o).
+set formatoptions+=ro
+" Don't break a line if was already longer then 'textwidth' when insert mode
+" started.
+set formatoptions+=l
+
+
 " Don't use any modelines.
 set nomodeline
 
+
 " When completing paths first use the longest path then display a list of all
 " possible files.
 set wildmode=longest,list
@@ -76,9 +85,16 @@ let NERDCreateDefaultMappings=0
 " Map toggle comment.
 map <Leader><Leader> <plug>NERDCommenterToggle
 
+" Maps to change spell language between English and German.
+map <Leader>se :set spelllang=en_us<CR>
+map <Leader>sd :set spelllang=de_de<CR>
+
+
 " I often type "W" instead of "w" when trying to save a file. Fix my mistake.
 cmap W w
 cmap Wq wq
+" Also fix my typo with "Q".
+cmap Q q
 
 
 " Disable Apple style movements in MacVim.