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>
diff --git a/runtime/autoload/dist/vim.vim b/runtime/autoload/dist/vim.vim
index d5a8984..021244c 100644
--- a/runtime/autoload/dist/vim.vim
+++ b/runtime/autoload/dist/vim.vim
@@ -15,16 +15,18 @@
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