runtime(sh): Update ftplugin (#12950)

Remove :Help command via the undo_ftplugin mechanism.

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/ftplugin/sh.vim b/runtime/ftplugin/sh.vim
index 7106bf91556abfc9d70423929358686b647c0618..4409f3f90c44e0002c366085e10914542a11d991 100644 (file)
--- a/runtime/ftplugin/sh.vim
+++ b/runtime/ftplugin/sh.vim
@@ -2,15 +2,14 @@
 " Language:            sh
 " Maintainer:          Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer: Dan Sharp
-" Last Change:         2022 Sep 07
+" Contributor:         Enno Nagel <ennonagel+vim@gmail.com>
+" Last Change:         2023 Aug 29
 
 if exists("b:did_ftplugin")
   finish
 endif
 let b:did_ftplugin = 1
 
-" Make sure the continuation lines below do not cause problems in
-" compatibility mode.
 let s:save_cpo = &cpo
 set cpo-=C
 
@@ -32,18 +31,17 @@ if exists("loaded_matchit") && !exists("b:match_words")
   let b:undo_ftplugin ..= " | unlet! b:match_ignorecase b:match_words"
 endif
 
-" Change the :browse e filter to primarily show shell-related files.
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-    let  b:browsefilter = "Bourne Shell Scripts (*.sh)\t*.sh\n" ..
-               \         "Korn Shell Scripts (*.ksh)\t*.ksh\n" ..
-               \         "Bash Shell Scripts (*.bash)\t*.bash\n" ..
-               \         "All Files (*.*)\t*.*\n"
+  let b:browsefilter = "Bourne Shell Scripts (*.sh)\t*.sh\n" ..
+       \              "Korn Shell Scripts (*.ksh)\t*.ksh\n" ..
+       \              "Bash Shell Scripts (*.bash)\t*.bash\n" ..
+       \              "All Files (*.*)\t*.*\n"
   let b:undo_ftplugin ..= " | unlet! b:browsefilter"
 endif
 
-if (exists('b:is_bash') && (b:is_bash == 1)) ||
-      \ (exists('b:is_sh') && (b:is_sh == 1))
-  if !has('gui_running') && executable('less')
+if (exists("b:is_bash") && (b:is_bash == 1)) ||
+      \ (exists("b:is_sh") && (b:is_sh == 1))
+  if !has("gui_running") && executable("less")
     command! -buffer -nargs=1 Help silent exe '!bash -c "{ help "<args>" 2>/dev/null || man "<args>"; } | LESS= less"' | redraw!
   elseif has('terminal')
     command! -buffer -nargs=1 Help silent exe ':term bash -c "help "<args>" 2>/dev/null || man "<args>""'
@@ -51,10 +49,9 @@ if (exists('b:is_bash') && (b:is_bash == 1)) ||
     command! -buffer -nargs=1 Help echo system('bash -c "help <args>" 2>/dev/null || man "<args>"')
   endif
   setlocal keywordprg=:Help
-  let b:undo_ftplugin .= '| setlocal keywordprg<'
+  let b:undo_ftplugin ..= " | setl kp< | sil! delc -buffer Help"
 endif
 
-" Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo