endif
-" MAPPINGS
+" MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
" Use "," as my mapleader.
let mapleader = ","
let maplocalleader = ","
-" Settings for the NERD commenter.
-" Don't create any mappings I don't want to use.
-let NERDCreateDefaultMappings=0
-" Map toggle comment.
-map <Leader><Leader> <plug>NERDCommenterToggle
+" Use <space> to move down a page and - to move up one like in mutt.
+nnoremap <Space> <C-f>
+nnoremap - <C-b>
" 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
+" 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")
syntax enable
+" PLUGIN SETTINGS
+
+" Settings for the NERD commenter.
+" Don't create any mappings I don't want to use.
+let NERDCreateDefaultMappings = 0
+" Map toggle comment.
+map <Leader><Leader> <plug>NERDCommenterToggle
+
+
" Automatically save and the load the file state (stored in ~/.vim/view).
autocmd BufWrite * mkview
autocmd BufRead * loadview