diff options
| author | Luke Kanies <luke@madstop.com> | 2007-12-22 21:44:37 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-12-22 21:44:37 -0600 |
| commit | 1deb7fd487dca1046beb933dca2cccadf44fa6f5 (patch) | |
| tree | 06343d67499adecb28c4465fd15c92ad9336e109 /ext/vim | |
| parent | f3fd7091d3db9dff1b177867589289890e9a3a66 (diff) | |
| parent | c4ed43c2a1ad9ab865e3da6b8b7fad28222c3451 (diff) | |
| download | puppet-1deb7fd487dca1046beb933dca2cccadf44fa6f5.tar.gz puppet-1deb7fd487dca1046beb933dca2cccadf44fa6f5.tar.xz puppet-1deb7fd487dca1046beb933dca2cccadf44fa6f5.zip | |
Merge branch '0.24.x'
Conflicts:
conf/redhat/puppet.spec
Diffstat (limited to 'ext/vim')
| -rw-r--r-- | ext/vim/README | 2 | ||||
| -rw-r--r-- | ext/vim/filetype.vim | 9 | ||||
| -rw-r--r-- | ext/vim/ftdetect/puppet.vim | 2 | ||||
| -rw-r--r-- | ext/vim/syntax/puppet.vim (renamed from ext/vim/puppet.vim) | 0 |
4 files changed, 4 insertions, 9 deletions
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 |