From 10c601851625784c7058f52c8d88bdb2e99b5620 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 8 Jul 2018 23:13:02 +1200
Subject: Overhaul base after-ftplugins

Mostly to simplify them--remove a lot of the load-guard cruft.
---
 vim/after/ftplugin/html.vim | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

(limited to 'vim/after/ftplugin/html.vim')

diff --git a/vim/after/ftplugin/html.vim b/vim/after/ftplugin/html.vim
index 8a1c22d4..545076b1 100644
--- a/vim/after/ftplugin/html.vim
+++ b/vim/after/ftplugin/html.vim
@@ -1,28 +1,15 @@
-" Extra configuration for 'html' filetypes
-if exists('b:did_ftplugin_after') || &compatible
+" Extra configuration for HTML files
+if &filetype != 'html' || &compatible || v:version < 700
   finish
 endif
-if v:version < 700
-  finish
-endif
-if &filetype !=# 'html'
-  finish
-endif
-let b:did_ftplugin_after = 1
-let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|unlet b:did_ftplugin_after'
 
 " Set up hooks for timestamp updating
-augroup html_timestamp
-  autocmd!
-  autocmd BufWritePre *.html
-        \ if exists('b:html_timestamp_check')
-        \|  call html#TimestampUpdate()
-        \|endif
-augroup END
+autocmd html_timestamp BufWritePre <buffer>
+      \ if exists('b:html_timestamp_check')
+      \|  call html#TimestampUpdate()
+      \|endif
 let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|augroup html_timestamp|autocmd!|augroup END'
-      \ . '|augroup! html_timestamp'
+      \ . '|autocmd! html_timestamp BufWritePre <buffer>'
 
 " Stop here if the user doesn't want ftplugin mappings
 if exists('g:no_plugin_maps') || exists('g:no_html_maps')
-- 
cgit v1.2.3