X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=8e64ca0204701c964fc05040a4532fcff0cead7c;hb=bb9334c564f0df7820a078671a988d35b900c278;hp=374c426930ad9a227847879478248d7eb4719260;hpb=174ef8c368e86bd89add90a27cf875b2685e3f94;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 374c426..8e64ca0 100644
--- a/vimrc
+++ b/vimrc
@@ -4,10 +4,13 @@
 " Make sure Vim (and not Vi) settings are enabled.
 set nocompatible
 
-" Enable automatic filedection, plugin and indention load.
+
+" EDIT SETTINGS
+
+" Enable automatic file detection, plugin and indention.
 filetype plugin indent on
 
-" Use utf-8 file encoding for all files.
+" Use UTF-8 file encoding for all files.
 set fileencodings=utf-8
 
 " Wrap text after 78 characters.
@@ -25,55 +28,81 @@ set tabstop=8
 " Enable auto indention.
 set autoindent
 
-" Activate lines display.
-set number
-" Display the ruler with current line/file position.
-set ruler
-" Display partial commands in the status line.
-set showcmd
+" When joining lines only add one space after a sentence.
+set nojoinspaces
+
+" 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).
+set formatoptions+=ro
+" Don't break a line if was already longer then 'textwidth' when insert mode
+" 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
 
 " Activate syntax folding.
 set foldmethod=syntax
 set foldcolumn=2
 set foldlevel=99 " no folding at default
 
-" Use smartcase mode when searching; only check for case if the searched word
-" contains a capital character.
+" Only check for case if the searched word contains a capital character.
 set ignorecase
 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
 
-" 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
+" DISPLAY SETTINGS
 
-" Start a comment when hitting enter after a commented line (r) and when using
-" o or O around a commented line (o).
-set formatoptions+=ro
-" Don't break a line if was already longer then 'textwidth' when insert mode
-" started.
-set formatoptions+=l
+" Use a dark background.
+set background=dark
+
+" Activate lines display.
+set number
+" Display the ruler with current line/file position.
+set ruler
+" Display partial commands in the status line.
+set showcmd
+
+" Visualize the line the cursor is currently in.
+if v:version >= 700
+    set cursorline
+endif
+
+" Display tabs as "^I" and trailing space as "-".
+set list
+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
 
-" Visualize the line the cursor is currently in.
-set cursorline
+" Increase number of tabs which can be opened with the -p option.
+if v:version >= 700
+    set tabpagemax=50
+endif
 
-" Use a dark background.
-set background=dark
 
+" MAPPINGS
 
 " Use "," as my mapleader.
 let mapleader = ","
@@ -89,13 +118,25 @@ map <Leader><Leader> <plug>NERDCommenterToggle
 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")
@@ -103,6 +144,8 @@ if has("gui_macvim")
 endif
 
 
+" SYNTAX SETTINGS
+
 " Activate syntax coloring.
 syntax enable