diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-04-06 05:44:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-06 05:44:37 +0800 |
| commit | 66568ed4521972cd34d9f635511b979481e2dc01 (patch) | |
| tree | e63a099ea87db2f96b74c11bffbe1f6833a51462 /runtime/compiler/powershell.vim | |
| parent | 7098341387346a95647e3521a4c30e904fc0ac50 (diff) | |
| download | rneovim-66568ed4521972cd34d9f635511b979481e2dc01.tar.gz rneovim-66568ed4521972cd34d9f635511b979481e2dc01.tar.bz2 rneovim-66568ed4521972cd34d9f635511b979481e2dc01.zip | |
vim-patch:b73faa1c02d0 (#28193)
runtime: fix :compiler leaving behind a g:makeprg variable (vim/vim#14414)
Problem: :compiler may leave behind a g:makeprg variable after vim/vim#14336.
Solution: Use a script local variable.
https://github.com/vim/vim/commit/b73faa1c02d0911a60bddd1ba343cf620f2cd124
Also apply previously omitted change to compiler/context.vim.
Diffstat (limited to 'runtime/compiler/powershell.vim')
| -rw-r--r-- | runtime/compiler/powershell.vim | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/compiler/powershell.vim b/runtime/compiler/powershell.vim index 4b1ce88e3d..821fea4085 100644 --- a/runtime/compiler/powershell.vim +++ b/runtime/compiler/powershell.vim @@ -4,6 +4,7 @@ " Contributors: Enno Nagel " Last Change: 2024 Mar 29 " 2024 Apr 03 by The Vim Project (removed :CompilerSet definition) +" 2024 Apr 05 by The Vim Project (avoid leaving behind g:makeprg) if exists("current_compiler") finish @@ -35,7 +36,7 @@ let g:ps1_efm_show_error_categories = get(g:, 'ps1_efm_show_error_categories', 0 " Use absolute path because powershell requires explicit relative paths " (./file.ps1 is okay, but # expands to file.ps1) -let makeprg = g:ps1_makeprg_cmd .. ' %:p:S' +let s:makeprg = g:ps1_makeprg_cmd .. ' %:p:S' " Parse file, line, char from callstacks: " Write-Ouput : The term 'Write-Ouput' is not recognized as the name of a @@ -48,7 +49,7 @@ let makeprg = g:ps1_makeprg_cmd .. ' %:p:S' " + CategoryInfo : ObjectNotFound: (Write-Ouput:String) [], CommandNotFoundException " + FullyQualifiedErrorId : CommandNotFoundException -execute 'CompilerSet makeprg=' .. escape(makeprg, ' ') +execute 'CompilerSet makeprg=' .. escape(s:makeprg, ' ') " Showing error in context with underlining. CompilerSet errorformat=%+G+%m |