diff options
| author | Sean Dewar <seandewar@users.noreply.github.com> | 2023-11-05 09:11:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-05 10:11:37 +0100 |
| commit | b2a4c110a5d13bc794f4eddb2e88a4e8fe9dfbea (patch) | |
| tree | de9ec29c7c7220221875171265e7280ccc66b941 /runtime | |
| parent | 6709816f7807c3ebb062a3124e660def184b739b (diff) | |
runtime(dist): Make dist/vim.vim work properly when lacking vim9script support (#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.
Signed-off-by: Sean Dewar <seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/autoload/dist/vim.vim | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/runtime/autoload/dist/vim.vim b/runtime/autoload/dist/vim.vim index d5a8984dc6..021244c93b 100644 --- a/runtime/autoload/dist/vim.vim +++ b/runtime/autoload/dist/vim.vim @@ -15,16 +15,18 @@ if !exists('g:gzip_exec') let g:gzip_exec = 1 endif -if !exists(":def") - function dist#vim#IsSafeExecutable(filetype, executable) +if !has('vim9script') + function dist#vim#IsSafeExecutable(filetype, executable) let cwd = getcwd() return get(g:, a:filetype .. '_exec', get(g:, 'plugin_exec', 0)) && \ (fnamemodify(exepath(a:executable), ':p:h') !=# cwd \ || (split($PATH, has('win32') ? ';' : ':')->index(cwd) != -1 && \ cwd != '.')) - endfunction -else - def dist#vim#IsSafeExecutable(filetype: string, executable: string): bool - return dist#vim9#IsSafeExecutable(filetype, executable) - enddef + endfunction + + finish endif + +def dist#vim#IsSafeExecutable(filetype: string, executable: string): bool + return dist#vim9#IsSafeExecutable(filetype, executable) +enddef |