vimrc: Ignore errors when pathogen is missing.

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 47e46c1c9e19de1b4dc8c05ef19f882047632aa0..7716d8c467fe2ba4e7a9695c0a82e67d9d293a2f 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -517,18 +517,23 @@ if has('syntax')
 
         if exists('*matchadd')
 " Highlight some important keywords in all documents.
-            for l:x in ['TODO', 'XXX', 'FIXME',
-                      \ 'CHANGED', 'REMOVED', 'DELETED']
-                call matchadd('Todo', l:x)
-            endfor
+            let l:todos = ['TODO', 'XXX', 'FIXME',
+                         \ 'CHANGED', 'REMOVED', 'DELETED']
+            " Compatibility fix for Vim 6.4 which can't handle for in function
+            " (without function it's ignored).
+            execute '  for l:x in l:todos'
+                  \ '|     call matchadd("Todo", l:x)'
+                  \ '| endfor'
 
 " Highlight unicode whitespace which is no normal whitespace (0x20).
-            for l:x in ['00a0', '1680', '180e', '2000', '2001', '2002',
-                      \ '2003', '2004', '2005', '2006', '2007', '2008',
-                      \ '2009', '200a', '200b', '200c', '200d', '202f',
-                      \ '205f', '2060', '3000', 'feff']
-                call matchadd('Error', '\%u' . l:x)
-            endfor
+            let l:spaces = ['00a0', '1680', '180e', '2000', '2001', '2002',
+                          \ '2003', '2004', '2005', '2006', '2007', '2008',
+                          \ '2009', '200a', '200b', '200c', '200d', '202f',
+                          \ '205f', '2060', '3000', 'feff']
+            " Compatibility fix for Vim 6.4.
+            execute '  for l:x in l:spaces'
+                  \ '|     call matchadd("Error", "\%u" . l:x)'
+                  \ '| endfor'
         endif
     endfunction
 " Enable highlights for the current and all new windows. Thanks to bairui in
@@ -567,9 +572,9 @@ endif
 if has('eval')
 " Use pathogen which allows one 'runtimepath' entry per plugin. This makes
 " installing/removing/updating plugins simple. (Used for plugins with more
-" than one file.)
+" than one file.) Ignore errors in case pathogen is not installed.
     if v:version >= 700
-        execute 'call pathogen#runtime_append_all_bundles()'
+        silent! execute 'call pathogen#runtime_append_all_bundles()'
     endif
 
 " Settings for the NERD commenter.