diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2023-10-06 22:50:17 +0200 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2023-10-07 00:48:35 +0200 |
| commit | e7c268e38f146cfc81b91c185c17b333e2f6364d (patch) | |
| tree | ee130c1de9e7174c1a79699a1b40fa200c4a9751 | |
| parent | 1ac588543ded834b254c7f6a73372583ce89f2ea (diff) | |
| download | rneovim-e7c268e38f146cfc81b91c185c17b333e2f6364d.tar.gz rneovim-e7c268e38f146cfc81b91c185c17b333e2f6364d.tar.bz2 rneovim-e7c268e38f146cfc81b91c185c17b333e2f6364d.zip | |
vim-patch:2a281ccca017
runtime(sh): Update ftplugin (vim/vim#13213)
Rename 'keywordprg' user command to ShKeywordPrg as this is just a
leaking implementation detail.
https://github.com/vim/vim/commit/2a281ccca017fb5e8ffd20a86aa390431224a2fd
Co-authored-by: dkearns <dougkearns@gmail.com>
| -rw-r--r-- | runtime/ftplugin/sh.vim | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/runtime/ftplugin/sh.vim b/runtime/ftplugin/sh.vim index c227838d18..c1a6bc5ade 100644 --- a/runtime/ftplugin/sh.vim +++ b/runtime/ftplugin/sh.vim @@ -3,7 +3,8 @@ " Maintainer: Doug Kearns <dougkearns@gmail.com> " Previous Maintainer: Dan Sharp " Contributor: Enno Nagel <ennonagel+vim@gmail.com> -" Last Change: 2023 Aug 29 +" Eisuke Kawashima +" Last Change: 2023 Sep 28 if exists("b:did_ftplugin") finish @@ -39,16 +40,16 @@ if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") let b:undo_ftplugin ..= " | unlet! b:browsefilter" endif -if (exists("b:is_bash") && (b:is_bash == 1)) +if get(b:, "is_bash", 0) 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>""' + command! -buffer -nargs=1 ShKeywordPrg silent exe '!bash -c "{ help "<args>" 2>/dev/null || man "<args>"; } | LESS= less"' | redraw! + elseif has("terminal") + command! -buffer -nargs=1 ShKeywordPrg silent exe ':term bash -c "help "<args>" 2>/dev/null || man "<args>""' else - command! -buffer -nargs=1 Help echo system('bash -c "help <args>" 2>/dev/null || man "<args>"') + command! -buffer -nargs=1 ShKeywordPrg echo system('bash -c "help <args>" 2>/dev/null || man "<args>"') endif - setlocal keywordprg=:Help - let b:undo_ftplugin ..= " | setl kp< | sil! delc -buffer Help" + setlocal keywordprg=:ShKeywordPrg + let b:undo_ftplugin ..= " | setl kp< | sil! delc -buffer ShKeywordPrg" endif let &cpo = s:save_cpo |