2 files changed, 3 insertions, 26 deletions
diff --git a/vim/after/ftplugin/c.vim b/vim/after/ftplugin/c.vim
index da34d269..ccc5b170 100644
--- a/vim/after/ftplugin/c.vim
+++ b/vim/after/ftplugin/c.vim
@@ -1,18 +1,13 @@
-" Extra configuration for C files
-if &filetype !=# 'c' || v:version < 700
-  finish
-endif
-
 " Include macros in completion
 setlocal complete+=d
-let b:undo_ftplugin .= '|setlocal complete<'
 
 " Set include pattern
 setlocal include=^\\s*#\\s*include
-let b:undo_ftplugin .= '|setlocal include<'
 
 " Include headers on UNIX
 if has('unix')
   setlocal path+=/usr/include
-  let b:undo_ftplugin .= '|setlocal path<'
 endif
+
+" Undo all of the above
+let b:undo_ftplugin .= '|setlocal complete< include< path<'
diff --git a/vim/after/ftplugin/cpp.vim b/vim/after/ftplugin/cpp.vim
deleted file mode 100644
index 4042fb84..00000000
--- a/vim/after/ftplugin/cpp.vim
+++ /dev/null
@@ -1,18 +0,0 @@
-" Extra configuration for C++ files
-if &filetype !=# 'cpp' || v:version < 700
-  finish
-endif
-
-" Include macros in completion
-setlocal complete+=d
-let b:undo_ftplugin .= '|setlocal complete<'
-
-" Set include pattern
-setlocal include=^\\s*#\\s*include
-let b:undo_ftplugin .= '|setlocal include<'
-
-" Include headers on UNIX
-if has('unix')
-  setlocal path+=/usr/include
-  let b:undo_ftplugin .= '|setlocal path<'
-endif