Commit: runtime(sh): Update ftplugin (#13213)

4 views
Skip to first unread message

Christian Brabandt

unread,
Oct 6, 2023, 2:00:13 PM10/6/23
to vim...@googlegroups.com
runtime(sh): Update ftplugin (#13213)

Commit: https://github.com/vim/vim/commit/2a281ccca017fb5e8ffd20a86aa390431224a2fd
Author: dkearns <dougk...@gmail.com>
Date: Sat Oct 7 04:59:42 2023 +1100

runtime(sh): Update ftplugin (https://github.com/vim/vim/issues/13213)

Rename 'keywordprg' user command to ShKeywordPrg as this is just a
leaking implementation detail.

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

diff --git a/runtime/ftplugin/sh.vim b/runtime/ftplugin/sh.vim
index c227838d1..c1a6bc5ad 100644
--- a/runtime/ftplugin/sh.vim
+++ b/runtime/ftplugin/sh.vim
@@ -3,7 +3,8 @@
" Maintainer: Doug Kearns <dougk...@gmail.com>
" Previous Maintainer: Dan Sharp
" Contributor: Enno Nagel <ennona...@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
Reply all
Reply to author
Forward
0 new messages