diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2023-08-30 09:25:39 +0200 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2023-08-30 09:55:24 +0200 |
| commit | 3fcd6da5b0bf6016be24b2574cfe3cdf1071237b (patch) | |
| tree | 6ac7f6edadde518de54ec2391dc506c2247fa215 | |
| parent | c4c5178b8e1a6335245f7b862e8db13087737e4b (diff) | |
| download | rneovim-3fcd6da5b0bf6016be24b2574cfe3cdf1071237b.tar.gz rneovim-3fcd6da5b0bf6016be24b2574cfe3cdf1071237b.tar.bz2 rneovim-3fcd6da5b0bf6016be24b2574cfe3cdf1071237b.zip | |
vim-patch:2ac708b54866
runtime(sh): Update ftplugin (vim/vim#12950)
Remove :Help command via the undo_ftplugin mechanism.
https://github.com/vim/vim/commit/2ac708b548660b232a32c52d89bde3d8596646c0
Co-authored-by: dkearns <dougkearns@gmail.com>
| -rw-r--r-- | runtime/ftplugin/sh.vim | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/runtime/ftplugin/sh.vim b/runtime/ftplugin/sh.vim index 7106bf9155..4409f3f90c 100644 --- 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 |