aboutsummaryrefslogtreecommitdiff
path: root/vim/after/ftplugin/html.vim
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-11-30 00:09:51 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-11-30 00:09:51 +1300
commit94816757caac0120df020ea281a8ab020256de21 (patch)
tree854ae7eb90e67c9d24382018da2594cc9966f840 /vim/after/ftplugin/html.vim
parentffc11a076b7bb0ce7ac936085a904eb35603fdac (diff)
parent6805bb4d1233fcb7f1ddfb2ff03e12b1f6f0f750 (diff)
downloaddotfiles-94816757caac0120df020ea281a8ab020256de21.tar.gz
dotfiles-94816757caac0120df020ea281a8ab020256de21.zip
Merge branch 'release/v2.0.0'v2.0.0
* release/v2.0.0: Update make_target.vim to v1.2.0 Comment conditional set of <Plug>(InsertCancel) Require Vim 7 for filetype and syntax highlights Simplify a load guard for sh.vim syntax tweaks Clear away a flag after HTML indent load Remove some Vim syntax boilerplate Pare down after/indent scripts a fair bit Remove some overzealous b:undo_* setting Add missing detail to a comment Remove double-key mapping shortcuts Remove boilerplate after/ftplugin load guards Simplify after/ftplugin for C Set b:did_ftplugin flag in Vim ftplugins Adjust a vimrc comment for clarity Simplify ft=sh subtype flag clearing Add dummy function for HTML omnicompletion Clear away stock ft=mail quoting maps Wrap autocmd! clear for ft=mail in :execute Add timestamp augroup clearing to Vim ft=html Abbreviate Vim ft=html autocmd clearing Restore value of 'colorcolumn' after ft=gitcommit Wrap Vim gitcommit autocmd clear in :execute
Diffstat (limited to 'vim/after/ftplugin/html.vim')
-rw-r--r--vim/after/ftplugin/html.vim7
1 files changed, 4 insertions, 3 deletions
diff --git a/vim/after/ftplugin/html.vim b/vim/after/ftplugin/html.vim
index 759d06bf..b5c387fb 100644
--- a/vim/after/ftplugin/html.vim
+++ b/vim/after/ftplugin/html.vim
@@ -1,5 +1,5 @@
-" Extra configuration for HTML files
-if &filetype !=# 'html' || v:version < 700 || &compatible
+" Don't load if the buffer is not actually HTML (e.g. Markdown)
+if &filetype !=# 'html'
finish
endif
@@ -16,7 +16,8 @@ augroup html_timestamp
\| call html#TimestampUpdate()
\|endif
augroup END
-let b:undo_ftplugin .= '|autocmd! html_timestamp BufWritePre <buffer>'
+let b:undo_ftplugin .= '|execute ''autocmd! html_timestamp'''
+ \ . '|augroup! html_timestamp'
" Stop here if the user doesn't want ftplugin mappings
if exists('g:no_plugin_maps') || exists('g:no_html_maps')