kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:b2a4c110a5d1

Browse Source 
runtime(dist): Make dist/vim.vim work properly when lacking vim9script support (vim/vim#13487)

`:return` cannot be used outside of `:function` (or `:def`) in older Vims
lacking Vim9script support or in Neovim, even when evaluation is being skipped
in the dead `:else` branch.

Instead, use the pattern described in `:h vim9-mix`, which uses `:finish` to end
script processing before it reaches the vim9script stuff.

b2a4c110a5

Co-authored-by: Sean Dewar <seandewar@users.noreply.github.com>
This commit is contained in:
Christian Clason 2023-11-05 11:32:43 +01:00
parent 2a47dbe228
commit dcf5999fcd
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
runtime/autoload/dist/vim.vim vendored
View File

@ -15,16 +15,18 @@ if !exists('g:gzip_exec')
let g:gzip_exec = 1 let g:gzip_exec = 1
endif endif
if !exists(":def") if !has('vim9script')
function dist#vim#IsSafeExecutable(filetype, executable) function dist#vim#IsSafeExecutable(filetype, executable)
let cwd = getcwd() let cwd = getcwd()
return get(g:, a:filetype .. '_exec', get(g:, 'plugin_exec', 0)) && return get(g:, a:filetype .. '_exec', get(g:, 'plugin_exec', 0)) &&
\ (fnamemodify(exepath(a:executable), ':p:h') !=# cwd \ (fnamemodify(exepath(a:executable), ':p:h') !=# cwd
\ || (split($PATH, has('win32') ? ';' : ':')->index(cwd) != -1 && \ || (split($PATH, has('win32') ? ';' : ':')->index(cwd) != -1 &&
\ cwd != '.')) \ cwd != '.'))
endfunction endfunction
else
def dist#vim#IsSafeExecutable(filetype: string, executable: string): bool finish
return dist#vim9#IsSafeExecutable(filetype, executable)
enddef
endif endif
def dist#vim#IsSafeExecutable(filetype: string, executable: string): bool
return dist#vim9#IsSafeExecutable(filetype, executable)
enddef