Mercurial > vim

changeset 36164:a34e38182b6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
runtime(zsh,sh): set and unset compiler in ftplugin Commit: https://github.com/vim/vim/commit/41c7bbaf8f567d3a19ab2a6191ec9937fb890220 Author: Konfekt <Konfekt@users.noreply.github.com> Date: Thu Sep 19 18:19:43 2024 +0200 runtime(zsh,sh): set and unset compiler in ftplugin closes: https://github.com/vim/vim/issues/15699 Signed-off-by: Konfekt <Konfekt@users.noreply.github.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Thu, 19 Sep 2024 18:30:06 +0200
parents 69fcd842687b
children d67898b33d92
files runtime/ftplugin/sh.vim runtime/ftplugin/zsh.vim
diffstat 2 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/ftplugin/sh.vim
+++ b/runtime/ftplugin/sh.vim
@@ -4,7 +4,7 @@
 " Previous Maintainer:	Dan Sharp
 " Contributor:		Enno Nagel <ennonagel+vim@gmail.com>
 "			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
--- a/runtime/ftplugin/zsh.vim
+++ b/runtime/ftplugin/zsh.vim
@@ -2,7 +2,7 @@
 " Language:             Zsh shell script
 " Maintainer:           Christian Brabandt <cb@256bit.org>
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" 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 !~# '/\%(
   else
     command! -buffer -nargs=1 ZshKeywordPrg echo system('MANPAGER= zsh -c "autoload -Uz run-help; run-help <args> 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 = '\<if\>:\<elif\>:\<else\>:\<fi\>'