" 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
+" Allow backspacing over autoindent and line breaks.
+set backspace=indent,eol
" Start a comment when hitting enter after a commented line (r) and when using
" o or O around a commented line (o).
" started.
set formatoptions+=l
+" Allow virtual editing (cursor can be positioned anywhere, even when there is
+" no character) in visual block mode.
+set virtualedit=block
+
" Already display matches while typing the search command. This makes spotting
" errors easily.
set incsearch
set smartcase
" Activate spell checking, use English as default.
-set spell
-set spelllang=en_us
+if v:version >= 700
+ set spell
+ set spelllang=en_us
+endif
" DISPLAY SETTINGS
set showcmd
" Visualize the line the cursor is currently in.
-set cursorline
+if v:version >= 700
+ set cursorline
+endif
" Display tabs as "^I" and trailing space as "-".
set list
" possible files.
set wildmode=longest,list
+" Increase number of tabs which can be opened with the -p option.
+if v:version >= 700
+ set tabpagemax=50
+endif
+
" MAPPINGS
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
+" Thanks to Tony Mechelynck <antoine.mechelynck@gmail.com> from the Vim
+" mailing list for the commands.
+if v:version < 700
+ cnoreabbrev W w
+ cnoreabbrev Wq wq
+else
+ cnoreabbrev <expr> W
+ \ ((getcmdtype() == ':' && getcmdpos() <= 2) ? 'w' : 'W')
+ cnoreabbrev <expr> Wq
+ \ ((getcmdtype() == ':' && getcmdpos() <= 3) ? 'wq' : 'Wq')
+endif
" Also fix my typo with "Q".
-cmap Q q
+if v:version < 700
+ cnoreabbrev Q q
+else
+ cnoreabbrev <expr> Q
+ \ ((getcmdtype() == ':' && getcmdpos() <= 2) ? 'q' : 'Q')
+endif
" Disable Apple style movements in MacVim.
if has("gui_macvim")