X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=10f06208009432269c64aeabc64eebbcecd257ec;hb=07df68dd9569ed4235c437affd601c4d88b0d684;hp=ebb30f56ea74f97dba56795a2da2069677e558ff;hpb=25159e436f0d1c5e5cd0834ec3ab524de4e4b735;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index ebb30f5..10f0620 100644
--- a/vimrc
+++ b/vimrc
@@ -6,10 +6,10 @@
 " Make sure Vim (and not Vi) settings are used.
 set nocompatible
 
-" Load my scripts from ~/.vim (my scripts), ~/.vim/plugins (plugins) and
-" ~/.vim/runtime (checkout of Vim runtime files).
+" Load my scripts from ~/.vim (my scripts) and ~/.vim/runtime (checkout of Vim
+" runtime files).
 set runtimepath-=~/.vim
-set runtimepath^=~/.vim,~/.vim/plugins,~/.vim/runtime
+set runtimepath^=~/.vim,~/.vim/runtime
 
 " Disable modelines as they may cause security problems. Instead use
 " securemodelines (Vim script #1876).
@@ -176,9 +176,10 @@ endif
 
 " Make sure xa0 (alt + space) is automatically changed to a normal whitespace
 " if pressed accidentally while in insert mode (happens on Mac when alt
-" doesn't send escape).
-if has('mac')
-    imap <Char-0xa0> <Space>
+" doesn't send escape). filereadable() is necessary for Leopard were 'mac' is
+" no longer set on the console.
+if has('mac') || filereadable('/Users/.localized')
+    inoremap <Char-0xa0> <Space>
 endif
 
 " Disable Apple style movements in MacVim.
@@ -200,6 +201,11 @@ if has('syntax')
     else
         match Todo /\%>78v./
     endif
+
+" Highlight TODO, FIXME, CHANGED and XXX in all documents.
+    if v:version >= 701 && has('patch40')
+        call matchadd('Todo', '\(TODO\|FIXME\|CHANGED\|XXX\)')
+    endif
 endif