X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=cfa181bc5f7925f84bc98d3eb86d5795b2d76fd3;hb=95d2fc838ee9187f7c6488d449d7769b77b0f3db;hp=aa8753b449dd7bada4cfe34a5879f9987e9d8cc0;hpb=1512ec164b355c1276dfb3a23061ce3570cd9dfb;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index aa8753b..cfa181b 100644
--- a/vimrc
+++ b/vimrc
@@ -25,10 +25,9 @@ set tabstop=8
 " Enable auto indention.
 set autoindent
 
-" Activate lines display.
-set number
-" Display the ruler.
-set ruler
+" Already display matches while typing the search command. This makes spotting
+" errors easily.
+set incsearch
 
 " Activate syntax folding.
 set foldmethod=syntax
@@ -44,24 +43,47 @@ set smartcase
 set spell
 set spelllang=en_us
 
+
+" Use a dark background.
+set background=dark
+
+" Activate lines display.
+set number
+" Display the ruler with current line/file position.
+set ruler
+" Display partial commands in the status line.
+set showcmd
+
+" Visualize the line the cursor is currently in.
+set cursorline
+
+" Display tabs as "^I" and trailing space as "-".
+set list
+set listchars=trail:-
+
+
 " When joining lines only add one space after a sentence.
 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
 
-" Visualize the line the cursor is currently in.
-set cursorline
-
-" Use a dark background.
-set background=dark
 
 
 " Use "," as my mapleader.
@@ -74,9 +96,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.