X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=vimrc;h=1f14e5f23944c073c9da799994db26a210b793dc;hb=1c46e36badce4692e1ce044ccaa79e68b042f6fc;hp=5d39f34cf54384612344920b2125c4144a77162a;hpb=f00e64bea12ae41e20f800c6fcb1b644bf1eb23e;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 5d39f34..1f14e5f 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
@@ -85,35 +89,55 @@ set listchars=trail:-
 
 " EDITOR SETTINGS
 
-" 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
 
+" Increase number of tabs which can be opened with the -p option.
+if v:version >= 700
+    set tabpagemax=50
+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")
@@ -126,7 +150,19 @@ 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
+
 
-" Automatically save and the load the file state (stored in ~/.vim/view).
-autocmd BufWrite * mkview
-autocmd BufRead  * loadview
+" 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