.vim: Fix PyEm filetype

[dotfiles.git] / .vim / filetype.vim

diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index 971c75e8a828548c57fef164f54de96a3bf10bd1..e39f2d540b83f7690296d3acd2c21b6616bcd2ce 100644 (file)
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -5,7 +5,10 @@ endif
 augroup filetypedetect
    " Text files
    autocmd BufNewFile,BufReadPost *.txt,*README* setlocal filetype=text
-   autocmd BufReadPost ~/tmp/*.txt setlocal textwidth=0 " Files from ViewSourceWith
+
+   " Files from textern
+   autocmd BufReadPost /tmp/textern*/*.txt setlocal textwidth=0
+   autocmd BufReadPost /tmp/textern*/stackoverflow.com*.txt Code
 
    " Cheetah templates
    autocmd BufNewFile,BufReadPost *.tmpl setlocal filetype=htmlcheetah
@@ -21,17 +24,15 @@ augroup filetypedetect
    " Python Templates (Quixote) are Python files
    autocmd BufNewFile,BufReadPost *.ptl setlocal filetype=python
    " Python Embedded are mason-like python templates
-   autocmd BufNewFile,BufReadPost *.pyem setlocal filetype=python filetype=mason
+   autocmd BufNewFile,BufReadPost *.pyem setlocal filetype=python.mason.html
 
    " ssh files
    autocmd BufReadPost known_hosts setlocal filetype=ssh
    autocmd BufReadPost authorized_keys setlocal filetype=ssh
 
-   " Set mapping for CVS/Subversion/Mercurial commit files
+   " Set mapping for CVS/Subversion/Mercurial/git commit files
    autocmd BufReadPost /tmp/cvs* setlocal filetype=cvscommit
    autocmd BufReadPost svn-commit.tmp*,svn-commit.*.tmp* setlocal filetype=svncommit
    autocmd BufReadPost /tmp/hg-editor-*.txt setlocal filetype=hgcommit
-
-   " Medap-RM Method files
-   autocmd BufNewFile,BufReadPost *.rsc setlocal filetype=conf filetype=medaprm-method
+   autocmd BufReadPost .git/*MSG setlocal filetype=gitcommit
 augroup END