aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-11-29 23:23:06 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-11-29 23:23:06 +1300
commit61ad1432240290f889ef11a4b527163cc8fff83d (patch)
treea775b3e5bacf7655f9f4ef7c3416d295b06688ae
parentda5f6cc79e233f3241bd47a862769f8c438c5986 (diff)
downloaddotfiles-61ad1432240290f889ef11a4b527163cc8fff83d.tar.gz
Simplify after/ftplugin for C
Allow the cpp plugin to load this, since it's the same anyway, and push all the undo stuff together.
-rw-r--r--vim/after/ftplugin/c.vim11
-rw-r--r--vim/after/ftplugin/cpp.vim18
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