X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=8e64ca0204701c964fc05040a4532fcff0cead7c;hb=4c23170a02f7c119715c19ae3293a563f34d9b33;hp=5d39f34cf54384612344920b2125c4144a77162a;hpb=f00e64bea12ae41e20f800c6fcb1b644bf1eb23e;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 5d39f34..8e64ca0 100644
--- a/vimrc
+++ b/vimrc
@@ -31,8 +31,8 @@ set autoindent
 " 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).
@@ -41,6 +41,10 @@ set formatoptions+=ro
 " 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
@@ -92,6 +96,11 @@ set nomodeline
 " 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
 
@@ -110,10 +119,24 @@ 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")