summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG2
-rw-r--r--ext/vim/README2
-rw-r--r--ext/vim/filetype.vim9
-rw-r--r--ext/vim/ftdetect/puppet.vim2
-rw-r--r--ext/vim/syntax/puppet.vim (renamed from ext/vim/puppet.vim)0
5 files changed, 6 insertions, 9 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 4235430b5..b29f76896 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+ Updated vim filetype detection. (#900 and #963)
+
Default resources like schedules no longer conflict with
managed resources. (#965)
diff --git a/ext/vim/README b/ext/vim/README
new file mode 100644
index 000000000..776bb1eb2
--- /dev/null
+++ b/ext/vim/README
@@ -0,0 +1,2 @@
+To install these files, copy them into ~/.vim, or the relevant
+system-wide location.
diff --git a/ext/vim/filetype.vim b/ext/vim/filetype.vim
deleted file mode 100644
index 2d73b4bfa..000000000
--- a/ext/vim/filetype.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-" detect puppet filetypes
-" $Id$
-
-if exists("did_load_filetypes")
- finish
-endif
-augroup filetypedetect
- au! BufRead,BufNewFile *.pp setfiletype puppet
-augroup END
diff --git a/ext/vim/ftdetect/puppet.vim b/ext/vim/ftdetect/puppet.vim
new file mode 100644
index 000000000..c9d15ea53
--- /dev/null
+++ b/ext/vim/ftdetect/puppet.vim
@@ -0,0 +1,2 @@
+" detect puppet filetype
+au BufRead,BufNewFile *.pp set filetype=puppet
diff --git a/ext/vim/puppet.vim b/ext/vim/syntax/puppet.vim
index a29e368e1..a29e368e1 100644
--- a/ext/vim/puppet.vim
+++ b/ext/vim/syntax/puppet.vim