From 09d180ee3c798928535c5a0d0677594605652b9a Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sun, 1 Jul 2018 22:33:01 +1200
Subject: Merge HTML timestamp into after/ftplugin/html.vim

I don't see myself breaking this out into its own ftplugin, and the
Makefile can be simpler this way.
---
 vim/after/ftplugin/html.vim           | 12 ++++++++++++
 vim/after/ftplugin/html/timestamp.vim | 28 ----------------------------
 2 files changed, 12 insertions(+), 28 deletions(-)
 delete mode 100644 vim/after/ftplugin/html/timestamp.vim

(limited to 'vim/after/ftplugin')

diff --git a/vim/after/ftplugin/html.vim b/vim/after/ftplugin/html.vim
index a8e9efcc..a9d3f948 100644
--- a/vim/after/ftplugin/html.vim
+++ b/vim/after/ftplugin/html.vim
@@ -9,6 +9,18 @@ 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
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|augroup html_timestamp|autocmd!|augroup END'
+      \ . '|augroup! html_timestamp'
+
 " Stop here if the user doesn't want ftplugin mappings
 if exists('g:no_plugin_maps') || exists('g:no_html_maps')
   finish
diff --git a/vim/after/ftplugin/html/timestamp.vim b/vim/after/ftplugin/html/timestamp.vim
deleted file mode 100644
index 29a215cd..00000000
--- a/vim/after/ftplugin/html/timestamp.vim
+++ /dev/null
@@ -1,28 +0,0 @@
-" html/timestamp.vim: Update timestamps in HTML files on save.
-
-" Don't load if running compatible or too old
-if &compatible || v:version < 700
-  finish
-endif
-
-" Don't load if already loaded
-if exists('b:did_ftplugin_html_timestamp')
-  finish
-endif
-
-" Flag as loaded
-let b:did_ftplugin_html_timestamp = 1
-let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|unlet b:did_ftplugin_html_timestamp'
-
-" Set up appropriate hooks
-augroup html_timestamp
-  autocmd!
-  autocmd BufWritePre *.html
-        \ if exists('b:html_timestamp_check')
-        \|  call html#timestamp#Update()
-        \|endif
-augroup END
-let b:undo_ftplugin = b:undo_ftplugin
-      \ . '|augroup html_timestamp|autocmd!|augroup END'
-      \ . '|augroup! html_timestamp'
-- 
cgit v1.2.3