X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=inline;f=vimrc;h=6b52841095d8e185ab869428098088fa0d86d6a5;hb=c69e2d2cfe47d4105042184c6459505a00b33481;hp=44ba05226538b58f62966a01cbb9d63d429dd16b;hpb=ff5cf8e030e6639ef9701a151ff94464cb10126c;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 44ba052..6b52841 100644
--- a/vimrc
+++ b/vimrc
@@ -4,6 +4,9 @@
 " Make sure Vim (and not Vi) settings are enabled.
 set nocompatible
 
+
+" EDIT SETTINGS
+
 " Enable automatic file detection, plugin and indention.
 filetype plugin indent on
 
@@ -25,6 +28,23 @@ set tabstop=8
 " Enable auto indention.
 set autoindent
 
+" 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
@@ -39,10 +59,14 @@ 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
 
@@ -54,36 +78,31 @@ 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
 
+" Increase number of tabs which can be opened with the -p option.
+if v:version >= 700
+    set tabpagemax=50
+endif
+
 
+" MAPPINGS
 
 " Use "," as my mapleader.
 let mapleader = ","
@@ -105,13 +124,14 @@ 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