diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2023-11-04 11:37:42 +0100 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2023-11-05 21:52:02 +0100 |
| commit | 26cdff0e92bf93a2afcb4a78e056780ea3f582e7 (patch) | |
| tree | d672f7ed765f668500b788b42703cfa0982d6709 /runtime/ftplugin/zig.vim | |
| parent | 8ae39eb58488a75b1e9add2bf12fbf9b10c6f0c8 (diff) | |
| download | rneovim-26cdff0e92bf93a2afcb4a78e056780ea3f582e7.tar.gz rneovim-26cdff0e92bf93a2afcb4a78e056780ea3f582e7.tar.bz2 rneovim-26cdff0e92bf93a2afcb4a78e056780ea3f582e7.zip | |
vim-patch:cd8a3eaf5348
runtime(dist): centralize safe executable check and add vim library (vim/vim#13413)
Follow up to 816fbcc26 (patch 9.0.1833: [security] runtime file fixes,
2023-08-31) and f7ac0ef50 (runtime: don't execute external commands when
loading ftplugins, 2023-09-06).
This puts the logic for safe executable checks in a single place, by introducing
a central vim library, so all filetypes benefit from consistency.
Notable changes:
- dist#vim because the (autoload) namespace for a new runtime support
library. Supporting functions should get documentation. It might make
life easier for NeoVim devs to make the documentation a new file
rather than cram it into existing files, though we may want
cross-references to it somewhere…
- The gzip and zip plugins need to be opted into by enabling execution
of those programs (or the global plugin_exec). This needs
documentation or discussion.
- This fixes a bug in the zig plugin: code setting s:tmp_cwd was removed
in f7ac0ef50 (runtime: don't execute external commands when loading
ftplugins, 2023-09-06), but the variable was still referenced. Since
the new function takes care of that automatically, the variable is no
longer needed.
https://github.com/vim/vim/commit/cd8a3eaf5348feacfecab4b374b7ea4ce6a97422
Co-authored-by: D. Ben Knoble <ben.knoble+github@gmail.com>
Diffstat (limited to 'runtime/ftplugin/zig.vim')
| -rw-r--r-- | runtime/ftplugin/zig.vim | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/runtime/ftplugin/zig.vim b/runtime/ftplugin/zig.vim index 291fe44b11..28b8cd5a67 100644 --- a/runtime/ftplugin/zig.vim +++ b/runtime/ftplugin/zig.vim @@ -41,16 +41,13 @@ let &l:define='\v(<fn>|<const>|<var>|^\s*\#\s*define)' " Safety check: don't execute zig from current directory if !exists('g:zig_std_dir') && exists('*json_decode') && - \ executable('zig') && get(g:, 'zig_exec', get(g:, 'plugin_exec', 0)) - \ && (fnamemodify(exepath("zig"), ":p:h") != s:tmp_cwd - \ || (index(split($PATH,has("win32")? ';' : ':'), s:tmp_cwd) != -1 && s:tmp_cwd != '.')) + \ executable('zig') && dist#vim#IsSafeExecutable('zig', 'zig') silent let s:env = system('zig env') if v:shell_error == 0 let g:zig_std_dir = json_decode(s:env)['std_dir'] endif unlet! s:env endif -unlet! s:tmp_cwd if exists('g:zig_std_dir') let &l:path = g:zig_std_dir . ',' . &l:path |