From: Konfekt Date: Thu, 19 Sep 2024 16:19:43 +0000 (+0200) Subject: runtime(zsh,sh): set and unset compiler in ftplugin X-Git-Tag: v9.1.0737~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41c7bbaf8f567d3a19ab2a6191ec9937fb890220;p=thirdparty%2Fvim.git runtime(zsh,sh): set and unset compiler in ftplugin closes: #15699 Signed-off-by: Konfekt Signed-off-by: Christian Brabandt --- diff --git a/runtime/ftplugin/sh.vim b/runtime/ftplugin/sh.vim index c47aa520e9..d2faf1a280 100644 --- a/runtime/ftplugin/sh.vim +++ b/runtime/ftplugin/sh.vim @@ -4,7 +4,7 @@ " Previous Maintainer: Dan Sharp " Contributor: Enno Nagel " Eisuke Kawashima -" Last Change: 2024 May 06 by Vim Project (MANPAGER=) +" Last Change: 2024 Sep 19 by Vim Project (compiler shellcheck) if exists("b:did_ftplugin") finish @@ -54,6 +54,11 @@ if get(b:, "is_bash", 0) endif setlocal keywordprg=:ShKeywordPrg let b:undo_ftplugin ..= " | setl kp< | sil! delc -buffer ShKeywordPrg" + + if !exists('current_compiler') + compiler shellcheck + endif + let b:undo_ftplugin .= ' | compiler make' endif let &cpo = s:save_cpo diff --git a/runtime/ftplugin/zsh.vim b/runtime/ftplugin/zsh.vim index aee890024f..5e69336aad 100644 --- a/runtime/ftplugin/zsh.vim +++ b/runtime/ftplugin/zsh.vim @@ -2,7 +2,7 @@ " Language: Zsh shell script " Maintainer: Christian Brabandt " Previous Maintainer: Nikolai Weibull -" Latest Revision: 2024 May 06 by Vim Project (MANPAGER=) +" Latest Revision: 2024 Sep 19 " License: Vim (see :h license) " Repository: https://github.com/chrisbra/vim-zsh @@ -26,11 +26,13 @@ if executable('zsh') && &shell !~# '/\%(nologin\|false\)$' else command! -buffer -nargs=1 ZshKeywordPrg echo system('MANPAGER= zsh -c "autoload -Uz run-help; run-help 2>/dev/null"') endif + setlocal keywordprg=:ZshKeywordPrg + let b:undo_ftplugin .= '| setl keywordprg< | sil! delc -buffer ZshKeywordPrg' + if !exists('current_compiler') compiler zsh endif - setlocal keywordprg=:ZshKeywordPrg - let b:undo_ftplugin .= 'keywordprg< | sil! delc -buffer ZshKeywordPrg' + let b:undo_ftplugin .= ' | compiler make' endif let b:match_words = '\:\:\:\'