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, 1 insertions, 13 deletions

diff --git a/vim/ftplugin/markdown.vim b/vim/ftplugin/markdown.vim
index 94f49c9b..c6a180a9 100644
--- a/vim/ftplugin/markdown.vim
+++ b/vim/ftplugin/markdown.vim
@@ -6,17 +6,11 @@
 " without providing a variable check to stop it. That causes absurd problems
 " with defining HTML checkers/linters in the rest of my files.
 "
-if exists('b:did_ftplugin')
+if exists('b:did_ftplugin') || &compatible
   finish
 endif
 let b:did_ftplugin = 1
 
-" Support line continuation for this file
-if &compatible
-  let s:cpoptions_save = &cpoptions
-  set cpoptions-=C
-endif
-
 " Set comment/quote patterns
 setlocal comments=fb:*,fb:-,fb:+,n:>
 setlocal commentstring=>\ %s
@@ -37,9 +31,3 @@ let b:undo_ftplugin = 'setlocal comments<'
       \ . '|setlocal commentstring<'
       \ . '|setlocal formatoptions<'
       \ . '|setlocal formatlistpat<'
-
-" Restore 'cpoptions' setting if we touched it
-if exists('s:cpoptions_save')
-  let &cpoptions = s:cpoptions_save
-  unlet s:cpoptions_save
-endif