X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=vimrc;h=59926eb4a784828bd906aa7f3522cb2db5c628a5;hb=9f610fb453be88ea9c03a451054eb3c6d0e62efa;hp=95318fec57a3b4afa93f880a4193cf6b214a729d;hpb=6f2cf38580db0de26020a1fc5bff4986c263cae9;p=config%2Fdotfiles.git

diff --git a/vimrc b/vimrc
index 95318fe..59926eb 100644
--- 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
@@ -175,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
 
@@ -199,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