Merge branch 'release/v0.54.0'v0.54.0

* release/v0.54.0:
  Regenerate dotfiles(7) manual
  Bump VERSION
  Add note about compiler scripts
  Arrange for tidiers to hold window position
  Update markdown_autoformat.vim
  Update surround.vim
  Completely overhaul after/ftplugin files
  Use short-circuit for no-mapping check
  Correct g:current_compiler setting
  Consistently require 'nocompatible' for ftplugins
  Upgrade insert_suspend_hlsearch.vim
  Use `function!` consistently in ftplugins
  Fix comments in vim/filetype.vim
  Set 'comments' blank by default
  Add Xresources filenames
  Add more names to Vim Bash types

1 files changed, 39 insertions, 29 deletions

diff --git a/vim/after/ftplugin/html/tidy.vim b/vim/after/ftplugin/html/tidy.vim
index 6e612feb..5a8ded7e 100644
--- a/vim/after/ftplugin/html/tidy.vim
+++ b/vim/after/ftplugin/html/tidy.vim
@@ -1,39 +1,49 @@
-" Only do this when not done yet for this buffer
-" Also do nothing if 'compatible' enabled, or if the current filetype is
-" actually markdown
-if exists('b:did_ftplugin_html_tidy') || &compatible
+" html/tidy.vim: Use tidy(1) to filter HTML documents
+
+" 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_tidy')
   finish
 endif
-if &filetype ==# 'markdown'
+
+" Don't load if the primary filetype isn't HTML
+if &filetype !=# 'html'
   finish
 endif
+
+" Flag as loaded
 let b:did_ftplugin_html_tidy = 1
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . '|unlet b:did_ftplugin_html_tidy'
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|unlet b:did_ftplugin_html_tidy'
+
+" Plugin function
+function s:HtmlTidy()
+  let l:view = winsaveview()
+  %!tidy -quiet
+  call winrestview(l:view)
+endfunction
+
+" Stop here if the user doesn't want ftplugin mappings
+if exists('g:no_plugin_maps') || exists('g:no_html_maps')
+  finish
 endif
 
-" Set up a mapping for the tidier, if we're allowed
-if !exists('g:no_plugin_maps') && !exists('g:no_html_maps')
+" Define a mapping target
+nnoremap <buffer> <silent> <unique>
+      \ <Plug>HtmlTidy
+      \ :<C-U>call <SID>HtmlTidy()<CR>
+let b:undo_ftplugin = b:undo_ftplugin
+      \ . '|nunmap <buffer> <Plug>HtmlTidy'
 
-  " Define a mapping target
-  nnoremap <buffer> <silent> <unique>
+" If there isn't a key mapping already, use a default one
+if !hasmapto('<Plug>HtmlTidy')
+  nmap <buffer> <unique>
+        \ <LocalLeader>t
         \ <Plug>HtmlTidy
-        \ :<C-U>%!tidy -quiet<CR>
-  if exists('b:undo_ftplugin')
-    let b:undo_ftplugin = b:undo_ftplugin
-          \ . '|nunmap <buffer> <Plug>HtmlTidy'
-  endif
-
-  " If there isn't a key mapping already, use a default one
-  if !hasmapto('<Plug>HtmlTidy')
-    nmap <buffer> <unique>
-          \ <LocalLeader>t
-          \ <Plug>HtmlTidy
-    if exists('b:undo_ftplugin')
-      let b:undo_ftplugin = b:undo_ftplugin
-            \ . '|nunmap <buffer> <LocalLeader>t'
-    endif
-  endif
-
+  let b:undo_ftplugin = b:undo_ftplugin
+        \ . '|nunmap <buffer> <LocalLeader>t'
 endif