From dcf5999fcd706c4319fb9c12bf9b46f2dd2b51b2 Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Sun, 5 Nov 2023 11:32:43 +0100 Subject: [PATCH] vim-patch:b2a4c110a5d1 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. https://github.com/vim/vim/commit/b2a4c110a5d13bc794f4eddb2e88a4e8fe9dfbea Co-authored-by: Sean Dewar --- runtime/autoload/dist/vim.vim | 16 +++++++++------- 1 file 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