Commit: runtime(systemd): small fixes to &keywordprg in ftplugin

[Christian Brabandt]

runtime(systemd): small fixes to &keywordprg in ftplugin

Commit: https://github.com/vim/vim/commit/f416a2220fbd457c3d3389fb0be59bee534a7491
Author: Konfekt <Kon...@users.noreply.github.com>
Date: Wed Oct 2 19:28:44 2024 +0200

runtime(systemd): small fixes to &keywordprg in ftplugin

closes: https://github.com/vim/vim/issues/15784

Signed-off-by: Konfekt <Kon...@users.noreply.github.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/ftplugin/systemd.vim b/runtime/ftplugin/systemd.vim
index 44e70bc22..1b1d24202 100644
--- a/runtime/ftplugin/systemd.vim
+++ b/runtime/ftplugin/systemd.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: systemd.unit(5)
" Keyword Lookup Support: Enno Nagel <enno.na...@gmail.com>
-" Latest Revision: 2024-09-19 (simplify keywordprg #15696)
+" Latest Revision: 2024-10-02 (small fixes to &keywordprg)

if exists("b:did_ftplugin")
finish
@@ -10,20 +10,20 @@ endif
runtime! ftplugin/dosini.vim

if has('unix') && executable('less') && exists(':terminal') == 2
- command -buffer -nargs=1 SystemdKeywordPrg silent exe 'term ' . KeywordLookup_systemd(<q-args>)
+ command! -buffer -nargs=1 SystemdKeywordPrg silent exe 'term ++close ' KeywordLookup_systemd(<q-args>)
silent! function KeywordLookup_systemd(keyword) abort
let matches = matchlist(getline(search(' ^\s*\[\s*.+\s*\]\s*$', 'nbWz')), ' ^\s*\[\s*(\k+).*\]\s*$')
if len(matches) > 1
let section = matches[1]
- return 'LESS= MANPAGER="less --pattern=''(^|,)\s+' . a:keyword . '=$'' --hilite-search" man ' . 'systemd.' . section
+ return 'env LESS= MANPAGER="less --pattern=''(^|,)\s+' . a:keyword . '=$'' --hilite-search" man ' . 'systemd.' . section
else
- return 'LESS= MANPAGER="less --pattern=''(^|,)\s+' . a:keyword . '=$'' --hilite-search" man ' . 'systemd'
+ return 'env LESS= MANPAGER="less --pattern=''(^|,)\s+' . a:keyword . '=$'' --hilite-search" man ' . 'systemd'
endif
endfunction
setlocal iskeyword+=-
setlocal keywordprg=:SystemdKeywordPrg
if !exists('b:undo_ftplugin') || empty(b:undo_ftplugin)
- let b:undo_ftplugin = 'setlocal keywordprg< iskeyword<'
+ let b:undo_ftplugin = 'setlocal keywordprg< iskeyword< | sil! delc -buffer SystemdKeywordPrg'
else
let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer SystemdKeywordPrg'
endif