vimrc: Also highlight REMOVED and DELETED.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 717105d2f9d27e4cc668f8f889d54006d22403b9..4b4e03cce905baa65271756daffa7376caaeef0b 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -53,7 +53,7 @@ set history=1000
 set undolevels=1000
 
 " Use strong encryption if possible, also used for swap/undo files.
-if v:version >= 703
+if exists('+cryptmethod')
     set cryptmethod=blowfish
 endif
 
@@ -120,7 +120,7 @@ set smartcase
 
 " Activate spell checking, use English as default. Don't use spell checking
 " when diffing.
-if v:version >= 700 && has('syntax') && !&diff
+if exists('+spell') && has('syntax') && !&diff
     set spell
     set spelllang=en_us
 endif
@@ -140,7 +140,7 @@ set background=dark
 set number
 " But use as little space as necessary for the numbers column. Thanks to James
 " Vega (http://git.jamessan.com/?p=etc/vim.git;a=summary).
-if v:version >= 700
+if exists('+numberwidth')
     set numberwidth=1
 endif
 " Display the ruler with current line/file position. If 'statusline' is used
@@ -154,7 +154,7 @@ set showcmd
 set lazyredraw
 
 " Visualize the line the cursor is currently in.
-if v:version >= 700
+if exists('+cursorline')
     set cursorline
 endif
 
@@ -257,7 +257,7 @@ nnoremap <C-W>O <C-W>p<C-W>o
 
 " Maps to change spell language between English and German and disable spell
 " checking.
-if v:version >= 700
+if exists('+spell')
     noremap <Leader>sn :set nospell<CR>
     noremap <Leader>se :set spell spelllang=en_us<CR>
     noremap <Leader>sd :set spell spelllang=de_de<CR>
@@ -345,21 +345,34 @@ if has('syntax')
 " Don't highlight more than 500 columns as I normally don't have that long
 " lines and they slow down syntax coloring. Thanks to Derek Wyatt
 " (http://www.derekwyatt.org/vim/the-vimrc-file/).
-    set synmaxcol=500
+    if exists('+synmaxcol')
+        set synmaxcol=500
+    endif
 
 " Highlight lines longer than 78 characters. Thanks to Tony Mechelynck
 " <antoine.mechelynck@gmail.com> from the Vim mailing list. It can easily be
 " disabled when necessary with :2match (in Vim >= 700).
-    if v:version >= 700
+    if exists(':2match')
         2match Todo /\%>78v./
     else
         match Todo /\%>78v./
     endif
 
-" Highlight TODO, FIXME, CHANGED and XXX in all documents.
-    if v:version > 701 || (v:version == 701 && has('patch42'))
-        call matchadd('Todo', '\(TODO\|FIXME\|CHANGED\|XXX\)')
+    if exists('*matchadd')
+" Highlight some important keywords in all documents.
+        for x in ['TODO', 'XXX', 'FIXME', 'CHANGED', 'REMOVED', 'DELETED']
+            call matchadd('Todo', x)
+        endfor
     endif
+
+" Settings for specific filetypes.
+
+    " Perl.
+    let g:perl_fold = 1
+    let g:perl_fold_blocks = 1
+    let g:perl_nofold_packages = 1
+    let g:perl_include_pod = 1 " syntax coloring for PODs
+
 endif
 
 
@@ -368,8 +381,8 @@ endif
 " Use pathogen which allows one 'runtimepath' entry per plugin. This makes
 " installing/removing/updating plugins simple. (Used for plugins with more
 " than one file.)
-if has('eval')
-    call pathogen#runtime_append_all_bundles()
+if has('eval') && v:version >= 700
+    execute 'call pathogen#runtime_append_all_bundles()'
 endif
 
 " Settings for the NERD commenter.
@@ -422,7 +435,9 @@ if has('autocmd')
 " Automatically disable 'paste' mode when leaving insert mode. Thanks to
 " Raimondi in #vim on Freenode (2010-08-14 23:01 CEST). Very useful as I only
 " want to paste once and then 'paste' gets automatically unset.
-        autocmd InsertLeave * set nopaste
+        if exists('#InsertLeave')
+            autocmd InsertLeave * set nopaste
+        endif
 
 " AFTER/FTPLUGIN AUTO COMMANDS
 
@@ -439,9 +454,6 @@ if has('autocmd')
 " the recommendation for git commit messages (http://tpope.net/node/106).
         autocmd FileType gitcommit let g:secure_modelines_allowed_items = [] |
                                  \ setlocal textwidth=72
-" Allow folding in perl.
-        autocmd FileType perl let perl_fold = 1 |
-                            \ let perl_fold_blocks = 1
 " Use the same comment string as for Vim files in Vimperator files.
         autocmd FileType vimperator setlocal commentstring=\"%s