6 files changed, 32 insertions, 17 deletions
diff --git a/vim/after/ftplugin/c.vim b/vim/after/ftplugin/c.vim
index e101b20c..fff9de04 100644
--- a/vim/after/ftplugin/c.vim
+++ b/vim/after/ftplugin/c.vim
@@ -5,5 +5,10 @@ endif
 
 " Set comment formats
 setlocal include=^\\s*#\\s*include
-setlocal path+=/usr/include
-let b:undo_ftplugin .= '|setlocal include< path<'
+let b:undo_ftplugin .= '|setlocal include<'
+
+" Include headers on UNIX
+if has('unix')
+  setlocal path+=/usr/include
+  let b:undo_ftplugin .= '|setlocal path<'
+endif
diff --git a/vim/after/ftplugin/cpp.vim b/vim/after/ftplugin/cpp.vim
index a826bf43..38c94330 100644
--- a/vim/after/ftplugin/cpp.vim
+++ b/vim/after/ftplugin/cpp.vim
@@ -5,5 +5,10 @@ endif
 
 " Set comment formats
 setlocal include=^\\s*#\\s*include
-setlocal path+=/usr/include
-let b:undo_ftplugin .= '|setlocal include< path<'
+let b:undo_ftplugin .= '|setlocal include<'
+
+" Include headers on UNIX
+if has('unix')
+  setlocal path+=/usr/include
+  let b:undo_ftplugin .= '|setlocal path<'
+endif
diff --git a/vim/after/indent/vim.vim b/vim/after/indent/vim.vim
index 73b4e430..ed1b8ebb 100644
--- a/vim/after/indent/vim.vim
+++ b/vim/after/indent/vim.vim
@@ -8,7 +8,6 @@ endif
 
 " Commands to undo the above
 if exists('b:undo_indent')
-  let b:undo_indent = b:undo_indent
-        \ . '|setlocal shiftwidth<'
-        \ . '|setlocal softtabstop<'
+  let b:undo_indent = b:undo_indent . '|setlocal shiftwidth<'
+  let b:undo_indent = b:undo_indent . '|setlocal softtabstop<'
 endif
diff --git a/vim/after/syntax/gitcommit.vim b/vim/after/syntax/gitcommit.vim
index e47091f9..2232e499 100644
--- a/vim/after/syntax/gitcommit.vim
+++ b/vim/after/syntax/gitcommit.vim
@@ -1,2 +1,8 @@
+" Don't try to make these corrections if running 'compatible' or if the
+" runtime files are too old
+if &compatible || v:version < 700
+  finish
+endif
+
 " If my commit subject is too long, highlight it as an error.
 highlight link gitCommitOverflow Error
diff --git a/vim/after/syntax/messages.vim b/vim/after/syntax/messages.vim
index 04faa607..75fe89b9 100644
--- a/vim/after/syntax/messages.vim
+++ b/vim/after/syntax/messages.vim
@@ -1,3 +1,9 @@
+" Don't try to make these corrections if running 'compatible' or if the
+" runtime files are too old
+if &compatible || v:version < 700
+  finish
+endif
+
 " The highlighting for errors in syslog/messages files is more often annoying
 " than useful, so just turn it off.
 syntax clear messagesError
diff --git a/vim/after/syntax/sh.vim b/vim/after/syntax/sh.vim
index 026e4ebd..00f95fc0 100644
--- a/vim/after/syntax/sh.vim
+++ b/vim/after/syntax/sh.vim
@@ -1,7 +1,7 @@
-" Support line continuation for this file
-if &compatible
-  let s:cpoptions_save = &cpoptions
-  set cpoptions-=C
+" Don't try to make these corrections if running 'compatible' or if the
+" runtime files are too old
+if &compatible || v:version < 700
+  finish
 endif
 
 " If we know we have another shell type, clear away the others completely, now
@@ -216,9 +216,3 @@ if exists('b:is_bash')
         \ variables
         \ wait
 endif
-
-" Restore 'cpoptions' setting if we touched it
-if exists('s:cpoptions_save')
-  let &cpoptions = s:cpoptions_save
-  unlet s:cpoptions_save
-endif