Fix dhall plugin, closes #519

README.md

@@ -69,7 +69,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [cucumber](https://github.com/tpope/vim-cucumber) (syntax, indent, compiler, ftplugin)
 - [cue](https://github.com/mgrabovsky/vim-cuesheet) (syntax)
 - [dart](https://github.com/dart-lang/dart-vim-plugin) (syntax, indent, autoload, ftplugin)
-- [dhall](https://github.com/vmchale/dhall-vim) (syntax, ftplugin)
+- [dhall](https://github.com/sheerun/dhall-vim) (syntax, ftplugin)
 - [dlang](https://github.com/JesseKPhillips/d.vim) (syntax, indent)
 - [dockerfile](https://github.com/ekalinin/Dockerfile.vim) (syntax, indent, ftplugin)
 - [elixir](https://github.com/elixir-lang/vim-elixir) (syntax, indent, compiler, autoload, ftplugin)

build

@@ -163,7 +163,7 @@ PACKS="
   cucumber:tpope/vim-cucumber
   cue:mgrabovsky/vim-cuesheet
   dart:dart-lang/dart-vim-plugin
-  dhall:vmchale/dhall-vim
+  dhall:sheerun/dhall-vim
   dlang:JesseKPhillips/d.vim
   dockerfile:ekalinin/Dockerfile.vim
   elixir:elixir-lang/vim-elixir

ftplugin/dhall.vim

@@ -9,13 +9,9 @@ setlocal commentstring=--\ %s
 
 set smarttab
 
-autocmd! dhall
-
 if exists('g:dhall_use_ctags')
     if g:dhall_use_ctags == 1
-        augroup dhall
+        autocmd BufWritePost *.dhall silent !ctags -R .
-            autocmd BufWritePost *.dhall silent !ctags -R .
-        augroup END
     endif
 endif
 
@@ -28,9 +24,7 @@ endfunction
 
 if exists('g:dhall_strip_whitespace')
     if g:dhall_strip_whitespace == 1
-        augroup dhall
+        au BufWritePre *.dhall silent! call StripTrailingWhitespace()
-            au BufWritePre *.dhall silent! call StripTrailingWhitespace()
-        augroup END
     endif
 endif
 
@@ -44,14 +38,10 @@ endfunction
 
 if exists('g:dhall_format')
     if g:dhall_format == 1
-        augroup dhall
+        au BufWritePost *.dhall call DhallFormat()
-            au BufWritePost *.dhall call DhallFormat()
-        augroup END
     endif
 endif
 
-augroup dhall
+au BufNewFile,BufRead *.dhall setl shiftwidth=2
-    au BufNewFile,BufRead *.dhall setl shiftwidth=2
-augroup END
 
 endif