X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=cd7c90e9ec1a06741bac569d35af9b3f25271516;hb=bf1259ccbdee487fc48c0a8f86815cb2b2476863;hp=49dbb7ac347eaea31229affc7b1791890c83b45a;hpb=ce082513fab8aa490a2a7a80df564136c82e3da9;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 49dbb7a..cd7c90e 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,16 +28,22 @@ 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
 
-" Display tabs as "^I" and trailing space as "-".
-set list
-set listchars=trail:-
+" 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.
@@ -45,43 +54,50 @@ 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
-
-" Use a dark background.
-set background=dark
 
+" MAPPINGS
 
 " Use "," as my mapleader.
 let mapleader = ","
@@ -97,20 +113,20 @@ 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
 " Also fix my typo with "Q".
 cmap Q q
 
-
 " Disable Apple style movements in MacVim.
 if has("gui_macvim")
     let macvim_skip_cmd_opt_movement = 1
 endif
 
 
+" SYNTAX SETTINGS
+
 " Activate syntax coloring.
 syntax enable