.vim: Fix PyEm filetype

diff --git a/.vim/after/indent/html.vim b/.vim/after/indent/html.vim
index 713a16b48f6280a6b9e255f9b3bfc0f4fe62dd5d..54b3866ee5d362cf08a51b9543804cc9bee1fed4 100644 (file)
--- a/.vim/after/indent/html.vim
+++ b/.vim/after/indent/html.vim
@@ -1,3 +1,6 @@
 " Don't re-indent lines on right-angle-bracket
 setlocal indentkeys-=<>>
-let b:undo_ftplugin .= '|setlocal indentkeys<'
+
+if exists('b:undo_ftplugin')
+   let b:undo_ftplugin .= '|setlocal indentkeys<'
+endif

diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index 2437adab5406f1352c1d2c693cff736c29d43c23..e39f2d540b83f7690296d3acd2c21b6616bcd2ce 100644 (file)
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -24,7 +24,7 @@ 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