X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=e44b0217d50d37d2431069f16286d27d3532b8b7;hb=77fb9cc20510d75cdc42c25b66b9f3c31b64d313;hp=6b52841095d8e185ab869428098088fa0d86d6a5;hpb=c69e2d2cfe47d4105042184c6459505a00b33481;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 6b52841..e44b021 100644
--- a/vimrc
+++ b/vimrc
@@ -102,27 +102,45 @@ if v:version >= 700
 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
+
+" Make sure xa0 (alt + space) is automatically changed to a normal whitespace
+" if pressed accidentally while in insert mode (happens on Mac sometimes).
+if has("mac")
+    imap <Char-0xa0> <Space>
+endif
 
 " Disable Apple style movements in MacVim.
 if has("gui_macvim")
@@ -135,6 +153,23 @@ endif
 " Activate syntax coloring.
 syntax enable
 
+" Highlight text longer then 78 characters. Thanks to Tony Mechelynck
+" <antoine.mechelynck@gmail.com> from the Vim mailing list.
+if v:version >= 700
+    2match Todo /\%>78v./
+else
+    match Todo /\%>78v./
+endif
+
+
+" 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