Merge plugins

[config/dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index b200fa4b63a2710da59db4995b0993cff65a8b47..59926eb4a784828bd906aa7f3522cb2db5c628a5 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -3,7 +3,7 @@
 
 " EDITOR SETTINGS
 
-" Make sure Vim (and not Vi) settings are enabled.
+" Make sure Vim (and not Vi) settings are used.
 set nocompatible
 
 " Load my scripts from ~/.vim (my scripts), ~/.vim/plugins (plugins) and
@@ -84,8 +84,9 @@ endif
 set ignorecase
 set smartcase
 
-" Activate spell checking, use English as default.
-if v:version >= 700
+" Activate spell checking, use English as default. Don't use spell checking
+" when diffing.
+if v:version >= 700 && !&diff
     set spell
     set spelllang=en_us
 endif
@@ -174,8 +175,10 @@ else
 endif
 
 " Make sure xa0 (alt + space) is automatically changed to a normal whitespace
-" if pressed accidentally while in insert mode (happens on Mac sometimes).
-if has('mac')
+" if pressed accidentally while in insert mode (happens on Mac when alt
+" 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
 
@@ -198,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