diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-12 01:20:13 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-07-12 01:20:13 +1200 |
| commit | e3cfbf8e680aae93fcb778a77c20247570453c8c (patch) | |
| tree | 63631f2ea936b6e92db315e99031fde422f5d727 /vim/after/ftplugin/html.vim | |
| parent | Merge branch 'release/v1.25.0' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-e3cfbf8e680aae93fcb778a77c20247570453c8c.tar.gz dotfiles-e3cfbf8e680aae93fcb778a77c20247570453c8c.zip | |
Merge branch 'release/v1.26.0'v1.26.0
* release/v1.26.0:
Bump VERSION
Upgrade insert_cancel.vim again
Check for +conceal before setting 'conceallevel'
Upgrade insert_cancel.vim
Remove session_lazy.vim
Add missing dot to mutt filetype.vim path
Add session_lazy.vim plugin
Add 'sessionoptions' settings
Correct login around ftplugin/make.vim mappings
Move after/ftplugin/sed.vim to ftplugin/sed.vim
Clean up existing ftplugins a bit
Overhaul after/ftplugin
Add explicit group to ftdetect rule
Move angle-bracket matchpairs to Perl filetype
Diffstat (limited to 'vim/after/ftplugin/html.vim')
| -rw-r--r-- | vim/after/ftplugin/html.vim | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/vim/after/ftplugin/html.vim b/vim/after/ftplugin/html.vim index d0625fb7..2faea4f5 100644 --- a/vim/after/ftplugin/html.vim +++ b/vim/after/ftplugin/html.vim @@ -1,16 +1,13 @@ " Extra configuration for HTML files -if &filetype != 'html' || &compatible || v:version < 700 +if &filetype !=# 'html' || v:version < 700 || &compatible finish endif " Use tidy(1) for checking and program formatting compiler tidy setlocal equalprg=tidy\ -quiet -let b:undo_ftplugin = b:undo_ftplugin - \ . '|unlet b:current_compiler' - \ . '|setlocal equalprg<' - \ . '|setlocal errorformat<' - \ . '|setlocal makeprg<' +let b:undo_ftplugin .= '|unlet b:current_compiler' + \ . '|setlocal equalprg< errorformat< makeprg<' " Set up hooks for timestamp updating augroup html_timestamp @@ -19,8 +16,7 @@ augroup html_timestamp \| call html#TimestampUpdate() \|endif augroup END -let b:undo_ftplugin = b:undo_ftplugin - \ . '|autocmd! html_timestamp BufWritePre <buffer>' +let b:undo_ftplugin .= '|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') @@ -30,5 +26,4 @@ endif " Set mappings nnoremap <buffer> <LocalLeader>r \ :<C-U>call html#UrlLink()<CR> -let b:undo_ftplugin = b:undo_ftplugin - \ . '|nunmap <buffer> <LocalLeader>r' +let b:undo_ftplugin .= '|nunmap <buffer> <LocalLeader>r' |