Update

7 files changed, 10 insertions, 111 deletions

diff --git a/README.md b/README.md
index fa70aff0..591861a7 100644
--- a/README.md
+++ b/README.md
@@ -119,7 +119,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [pug](https://github.com/digitaltoad/vim-pug) (syntax, indent, ftplugin)
 - [puppet](https://github.com/voxpupuli/vim-puppet) (syntax, indent, ftplugin)
 - [purescript](https://github.com/purescript-contrib/purescript-vim) (syntax, indent, ftplugin)
-- [python-compiler](https://github.com/aliev/vim-compiler-python) (compiler, autoload)
+- [python-compiler](https://github.com/aliev/vim-compiler-python) ()
 - [python-ident](https://github.com/Vimjas/vim-python-pep8-indent) (indent)
 - [python](https://github.com/vim-python/python-syntax) (syntax)
 - [qml](https://github.com/peterhoeg/vim-qml) (syntax, indent, ftplugin)
diff --git a/autoload/python/utils.vim b/autoload/python/utils.vim
deleted file mode 100644
index 51ba9ef1..00000000
--- a/autoload/python/utils.vim
+++ /dev/null
@@ -1,21 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
-  
-" Sometimes Python issues debugging messages
-" which don't belong to a call stack context
-" this function filters these messages
-function! python#utils#fix_qflist() " {{{
-  let l:traceback = []
-  let l:qflist = getqflist()
-
-  for l:item in l:qflist
-    if !empty(l:item.type)
-      call add(l:traceback, l:item)
-    endif
-  endfor
-
-  if !empty(l:traceback)
-    call setqflist(l:traceback)
-  endif
-endfunction " }}}
-
-endif
diff --git a/compiler/python.vim b/compiler/python.vim
deleted file mode 100644
index 844c9785..00000000
--- a/compiler/python.vim
+++ /dev/null
@@ -1,71 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
-  
-" Vim compiler file
-" Compiler:	Unit testing tool for Python
-" Maintainer:	Ali Aliev <ali@aliev.me>
-" Last Change: 2015 Nov 2
-
-if exists("current_compiler")
-  finish
-endif
-
-let current_compiler = "python"
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-" Disable Python warnings
-if !exists('$PYTHONWARNINGS')
-  let $PYTHONWARNINGS="ignore"
-endif
-
-" For Flake8 first
-CompilerSet efm  =%E%f:%l:\ could\ not\ compile,
-CompilerSet efm +=%-Z%p^,
-CompilerSet efm +=%A%f:%l:%c:\ %t%n\ %m,
-CompilerSet efm +=%A%f:%l:\ %t%n\ %m,
-
-" Python errors are multi-lined. They often start with 'Traceback', so
-" we want to capture that (with +G) and show it in the quickfix window
-" because it explains the order of error messages.
-
-CompilerSet efm +=%+GTraceback%.%#,
-
-" The error message itself starts with a line with 'File' in it. There
-" are a couple of variations, and we need to process a line beginning
-" with whitespace followed by File, the filename in "", a line number,
-" and optional further text. %E here indicates the start of a multi-line
-" error message. The %\C at the end means that a case-sensitive search is
-" required.
-CompilerSet efm +=%E\ \ File\ \"%f\"\\,\ line\ %l\\,%m%\\C,
-CompilerSet efm +=%E\ \ File\ \"%f\"\\,\ line\ %l%\\C,
-
-" The possible continutation lines are idenitifed to Vim by %C. We deal
-" with these in order of most to least specific to ensure a proper
-" match. A pointer (^) identifies the column in which the error occurs
-" (but will not be entirely accurate due to indention of Python code).
-CompilerSet efm +=%C%p^,
-
-" Any text, indented by more than two spaces contain useful information.
-" We want this to appear in the quickfix window, hence %+.
-CompilerSet efm +=%+C\ \ \ \ %.%#,
-CompilerSet efm +=%+C\ \ %.%#,
-
-" The last line (%Z) does not begin with any whitespace. We use a zero
-" width lookahead (\&) to check this. The line contains the error
-" message itself (%m)
-CompilerSet efm +=%Z%\\S%\\&%m,
-
-" We can ignore any other lines (%-G)
-CompilerSet efm +=%-G%.%#
-
-if filereadable("Makefile")
-  CompilerSet makeprg=make
-else
-  CompilerSet makeprg=python
-endif
-
-" vim:foldmethod=marker:foldlevel=0
-
-endif
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index ff06c80b..549851e0 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -827,18 +827,6 @@ au FileType purescript let &l:commentstring='{--%s--}'
   augroup end
 endif
 
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
-  augroup filetypedetect
-  " python-compiler, from python.vim in aliev/vim-compiler-python
-" Vim compiler file
-" Compiler:	Unit testing tool for Python
-" Maintainer:	Ali Aliev <ali@aliev.me>
-" Last Change: 2015 Nov 2
-
-autocmd FileType python compiler python
-  augroup end
-endif
-
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
   augroup filetypedetect
   " qml, from qml.vim in peterhoeg/vim-qml
diff --git a/ftplugin/haml.vim b/ftplugin/haml.vim
index 86df1d87..6339f556 100644
--- a/ftplugin/haml.vim
+++ b/ftplugin/haml.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 " Vim filetype plugin
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2010 May 21
+" Last Change:	2016 Aug 29
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -39,6 +39,8 @@ endif
 runtime! ftplugin/ruby.vim ftplugin/ruby_*.vim ftplugin/ruby/*.vim
 let b:did_ftplugin = 1
 
+let &l:define .= empty(&l:define ? '' : '\|') . '^\s*\%(%\w*\)\=\%(\.[[:alnum:]_-]\+\)*#'
+
 " Combine the new set of values with those previously included.
 if exists("b:undo_ftplugin")
   let s:undo_ftplugin = b:undo_ftplugin . " | " . s:undo_ftplugin
@@ -62,10 +64,11 @@ endif
 
 setlocal comments= commentstring=-#\ %s
 
-let b:undo_ftplugin = "setl cms< com< "
+let b:undo_ftplugin = "setl def< cms< com< "
       \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
 
 let &cpo = s:save_cpo
+unlet s:save_cpo
 
 " vim:set sw=2:
 
diff --git a/indent/haml.vim b/indent/haml.vim
index c251a4c4..2ddd3da5 100644
--- a/indent/haml.vim
+++ b/indent/haml.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 " Vim indent file
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2010 May 21
+" Last Change:	2016 Aug 29
 
 if exists("b:did_indent")
   finish
@@ -12,7 +12,7 @@ runtime! indent/ruby.vim
 unlet! b:did_indent
 let b:did_indent = 1
 
-setlocal autoindent sw=2 et
+setlocal autoindent
 setlocal indentexpr=GetHamlIndent()
 setlocal indentkeys=o,O,*<Return>,},],0),!^F,=end,=else,=elsif,=rescue,=ensure,=when
 
diff --git a/syntax/haml.vim b/syntax/haml.vim
index c1c407f0..721277ce 100644
--- a/syntax/haml.vim
+++ b/syntax/haml.vim
@@ -4,7 +4,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
 " Filenames:	*.haml
-" Last Change:	2010 Aug 09
+" Last Change:	2018 Aug 21
 
 if exists("b:current_syntax")
   finish
@@ -40,7 +40,7 @@ syn match   hamlDespacer "[<>]" contained nextgroup=hamlDespacer,hamlSelfCloser,
 syn match   hamlSelfCloser "/" contained
 syn match   hamlClassChar "\." contained nextgroup=hamlClass
 syn match   hamlIdChar "#{\@!" contained nextgroup=hamlId
-syn match   hamlClass "\%(\w\|-\)\+" contained nextgroup=@hamlComponent
+syn match   hamlClass "\%(\w\|-\|\:\)\+" contained nextgroup=@hamlComponent
 syn match   hamlId    "\%(\w\|-\)\+" contained nextgroup=@hamlComponent
 syn region  hamlDocType start="^\s*!!!" end="$"