Merge remote-tracking branch 'upstream/master' into mix_20240309

1 files changed, 2 insertions, 5 deletions

diff --git a/runtime/compiler/context.vim b/runtime/compiler/context.vim
index cb78c96df0..3d626ffa60 100644
--- a/runtime/compiler/context.vim
+++ b/runtime/compiler/context.vim
@@ -9,10 +9,6 @@ endif
 let s:keepcpo= &cpo
 set cpo&vim
 
-if exists(":CompilerSet") != 2    " older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
 " If makefile exists and we are not asked to ignore it, we use standard make
 " (do not redefine makeprg)
 if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
@@ -20,11 +16,12 @@ if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
   let current_compiler = 'context'
   " The following assumes that the current working directory is set to the
   " directory of the file to be typeset
-  let &l:makeprg = get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
+  let s:makeprg = get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
         \ . ' --script context --autogenerate --nonstopmode --synctex='
         \ . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
         \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
         \ . ' ' . shellescape(expand('%:p:t'))
+  execute 'CompilerSet makeprg=' .. escape(s:makeprg, ' ')
 else
   let current_compiler = 'make'
 endif