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

diff --git a/vimrc b/vimrc
index cfa181b..5d39f34 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,6 +28,19 @@ set tabstop=8
 " Enable auto indention.
 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
+
+" 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
+
 " Already display matches while typing the search command. This makes spotting
 " errors easily.
 set incsearch
@@ -34,16 +50,19 @@ 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
 
 
+" DISPLAY SETTINGS
+
 " Use a dark background.
 set background=dark
 
@@ -55,36 +74,26 @@ set ruler
 set showcmd
 
 " Visualize the line the cursor is currently in.
-set cursorline
+if v:version >= 700
+    set cursorline
+endif
 
 " Display tabs as "^I" and trailing space as "-".
 set list
 set listchars=trail:-
 
 
-" 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
-
-" 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
-
+" 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
 
 
+" MAPPINGS
 
 " Use "," as my mapleader.
 let mapleader = ","
@@ -100,20 +109,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