From: Oleg Broytman <phd@phdru.name>
Date: Wed, 24 Jun 2020 15:45:11 +0000 (+0300)
Subject: .vim: Fix PyEm filetype
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=04bbc0256453a304c73e24035fefb995c158953a;p=dotfiles.git

.vim: Fix PyEm filetype
---

diff --git a/.vim/after/indent/html.vim b/.vim/after/indent/html.vim
index 713a16b..54b3866 100644
--- 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 2437ada..e39f2d5 100644
--- 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