thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

runtime: fix :compiler leaving behind a g:makeprg variable (#14414)

Browse Source 
Problem:  :compiler may leave behind a g:makeprg variable after #14336.
Solution: Use a script local variable.

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-04-06 02:01:16 +08:00 committed by GitHub
parent cec44eae82
commit b73faa1c02
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/compiler/powershell.vim
View File

@ -4,6 +4,7 @@
" Contributors: Enno Nagel " Contributors: Enno Nagel
" Last Change: 2024 Mar 29 " Last Change: 2024 Mar 29
" 2024 Apr 03 by The Vim Project (removed :CompilerSet definition) " 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") if exists("current_compiler")
finish 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 " Use absolute path because powershell requires explicit relative paths
" (./file.ps1 is okay, but # expands to file.ps1) " (./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: " Parse file, line, char from callstacks:
" Write-Ouput : The term 'Write-Ouput' is not recognized as the name of a " 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 " + CategoryInfo : ObjectNotFound: (Write-Ouput:String) [], CommandNotFoundException
" + FullyQualifiedErrorId : CommandNotFoundException " + FullyQualifiedErrorId : CommandNotFoundException
execute 'CompilerSet makeprg=' .. escape(makeprg, ' ') execute 'CompilerSet makeprg=' .. escape(s:makeprg, ' ')
" Showing error in context with underlining. " Showing error in context with underlining.
CompilerSet errorformat=%+G+%m CompilerSet errorformat=%+G+%m

5
runtime/compiler/tex.vim
View File

@ -4,6 +4,7 @@
" Contributors: Enno Nagel " Contributors: Enno Nagel
" Last Change: 2024 Mar 29 " Last Change: 2024 Mar 29
" 2024 Apr 03 by The Vim Project (removed :CompilerSet definition) " 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") if exists("current_compiler")
finish finish
@ -25,8 +26,8 @@ if exists('b:tex_ignore_makefile') || exists('g:tex_ignore_makefile') ||
else else
let current_compiler = "latex" let current_compiler = "latex"
endif endif
let makeprg=current_compiler .. ' -interaction=nonstopmode' let s:makeprg=current_compiler .. ' -interaction=nonstopmode'
execute 'CompilerSet makeprg=' .. escape(makeprg, ' ') execute 'CompilerSet makeprg=' .. escape(s:makeprg, ' ')
else else
let current_compiler = 'make' let current_compiler = 'make'
endif endif