X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=61a07040859e69570e18317fbebad844f193040b;hb=363bce2670cc10f255e49f640f5ca1927fe5ba36;hp=3d269fa0634e3c84a5ff08547dda922e8503dfbe;hpb=267c1bb661b467c3e663eee4cbde97cffa04b524;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 3d269fa..61a0704 100644
--- a/vimrc
+++ b/vimrc
@@ -8,7 +8,9 @@ set nocompatible
 " EDIT SETTINGS
 
 " Enable automatic file detection, plugin and indention.
-filetype plugin indent on
+if has("autocmd")
+    filetype plugin indent on
+endif
 
 " Use UTF-8 file encoding for all files.
 set fileencodings=utf-8
@@ -50,9 +52,11 @@ set virtualedit=block
 set incsearch
 
 " Activate syntax folding.
-set foldmethod=syntax
-set foldcolumn=2
-set foldlevel=99 " no folding at default
+if has("folding")
+    set foldmethod=syntax
+    set foldcolumn=2
+    set foldlevel=99 " no folding at default
+endif
 
 " Only check for case if the searched word contains a capital character.
 set ignorecase
@@ -102,8 +106,10 @@ endif
 " MAPPINGS (except for plugins, see PLUGIN SETTINGS below)
 
 " Use "," as my mapleader.
-let mapleader = ","
-let maplocalleader = ","
+if has("eval")
+    let mapleader = ","
+    let maplocalleader = ","
+endif
 
 " Use <space> to move down a page and - to move up one like in mutt.
 nnoremap <Space> <C-f>
@@ -113,6 +119,11 @@ nnoremap - <C-b>
 map <Leader>se :set spelllang=en_us<CR>
 map <Leader>sd :set spelllang=de_de<CR>
 
+" Add semicolon to the end of the line. Thanks to
+" http://www.van-laarhoven.org/vim/.vimrc for this idea and godlygeek in #vim
+" for an improved version which doesn't clobber any marks.
+nnoremap <silent> ; :call setline(line('.'), getline('.') . ';')<CR>
+
 " I often type "W" instead of "w" when trying to save a file. Fix my mistake.
 " Thanks to Tony Mechelynck <antoine.mechelynck@gmail.com> from the Vim
 " mailing list for the commands.
@@ -140,7 +151,7 @@ if has("mac")
 endif
 
 " Disable Apple style movements in MacVim.
-if has("gui_macvim")
+if has("gui_macvim") && has("eval")
     let macvim_skip_cmd_opt_movement = 1
 endif
 
@@ -165,6 +176,23 @@ endif
 
 " Settings for the NERD commenter.
 " Don't create any mappings I don't want to use.
-let NERDCreateDefaultMappings = 0
+if has("eval")
+    let NERDCreateDefaultMappings = 0
+endif
 " Map toggle comment.
 map <Leader><Leader> <plug>NERDCommenterToggle
+
+
+" AUTO COMMANDS
+
+" Use a custom auto group to prevent problems when the vimrc files is sourced
+" twice.
+if has("autocmd")
+    augroup vimrc
+        autocmd!
+
+" Use diff filetype for mercurial patches in patch queue.
+        autocmd BufReadPost */.hg/patches/* set filetype=diff
+
+    augroup END
+endif