Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of github.com:shumphrey/Vim-Settings
  • Loading branch information
shumphrey committed Aug 9, 2014
2 parents 32c27eb + e5a1bf7 commit c5c2341
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Expand Up @@ -37,3 +37,6 @@
[submodule "bundle/fugitive-gitlab"]
path = bundle/fugitive-gitlab
url = https://github.com/shumphrey/fugitive-gitlab.vim.git
[submodule "/home/shumphrey/.vim/bundle/gundo"]
path = /home/shumphrey/.vim/bundle/gundo
url = http://github.com/sjl/gundo.vim.git
4 changes: 4 additions & 0 deletions snippets/perl.snippets
Expand Up @@ -26,3 +26,7 @@ $t->run_psgi_test('get', ${1:uri}, sub {
$2
});
endsnippet

snippet requires "cpanrequires"
req '${1:MODULE}', '>= ${2:VERSION}';
endsnippet
6 changes: 3 additions & 3 deletions vimrc
Expand Up @@ -165,8 +165,8 @@ endif
augroup filetypes
au!

au BufNewFile,BufRead *.tt,*.xmlbez set filetype=tt2html.javascript.xhtml.css
au BufNewFile,BufRead *.psgi,*.t set filetype=perl
au BufNewFile,BufRead *.tt,*.xmlbez,*.tx set filetype=tt2html.javascript.html.css
au BufNewFile,BufRead *.psgi,*.t,cpanfile set filetype=perl

" Make tt files use snippets from xhtml, javascript and css
au BufNewFile,BufRead *.tt UltiSnipsAddFiletypes xhtml.javascript.css
Expand All @@ -175,7 +175,7 @@ augroup filetypes
au BufNewFile * silent! 0r ~/.vim/skeleton/template.%:e

" Set the sparkup filetypes
au FileType tt2html,php runtime! ftplugin/html/sparkup.vim
au FileType tt,tt2html,php runtime! ftplugin/html/sparkup.vim

" Set the compiler for perl
au BufNewFile,BufRead *.pl,*.pm,*.t compiler perl
Expand Down

0 comments on commit c5c2341

Please sign in to comment.