Merge plugins

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index ebb30f56ea74f97dba56795a2da2069677e558ff..59926eb4a784828bd906aa7f3522cb2db5c628a5 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -176,8 +176,9 @@ 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')
+" doesn't send escape). filereadable() is necessary for Leopard were 'mac' is
+" no longer set on the console.
+if has('mac') || filereadable('/Users/.localized')
     imap <Char-0xa0> <Space>
 endif
 
@@ -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