diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-08-06 06:47:38 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2024-08-06 06:47:53 +0800 |
| commit | 6f5b904fb2481f910ef0c186280fb5d5c2cc0d70 (patch) | |
| tree | d60d6f55b4b14402e33082bd79c34f2f8bf5c566 /runtime | |
| parent | 9a30abb29255cc3cffa0c21ea13faccac092ea78 (diff) | |
| download | rneovim-6f5b904fb2481f910ef0c186280fb5d5c2cc0d70.tar.gz rneovim-6f5b904fb2481f910ef0c186280fb5d5c2cc0d70.tar.bz2 rneovim-6f5b904fb2481f910ef0c186280fb5d5c2cc0d70.zip | |
vim-patch:f0e9b72: runtime(zip): Fix for FreeBSD's unzip command
Problem: Cannot browse zipfiles with the unzip program found
on FreeBSD.
Solution: Adjust command arguments.
Unzip found on FreeBSD complain about missing argument with the
zipinfo modifier '-Z -1'. Joining arguments seems to work
for both implementations.
Also change `:sil!` to `:sil` so that error messages are properly
reported (per review of Christian Brabandt).
related: vim/vim#15411
https://github.com/vim/vim/commit/f0e9b72c8fdd47b9b410a11edf7479953cb2aed9
Co-authored-by: Damien <141588647+xrandomname@users.noreply.github.com>
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/autoload/zip.vim | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim index e8973e3c80..8876ef08e6 100644 --- a/runtime/autoload/zip.vim +++ b/runtime/autoload/zip.vim @@ -1,6 +1,6 @@ " zip.vim: Handles browsing zipfiles " AUTOLOAD PORTION -" Date: Jul 30, 2024 +" Date: Aug 05, 2024 " Version: 33 " Maintainer: This runtime file is looking for a new maintainer. " Former Maintainer: Charles E Campbell @@ -8,8 +8,9 @@ " 2024 Jun 16 by Vim Project: handle whitespace on Windows properly (#14998) " 2024 Jul 23 by Vim Project: fix 'x' command " 2024 Jul 24 by Vim Project: use delete() function -" 2024 Jul 20 by Vim Project: fix opening remote zipfile +" 2024 Jul 30 by Vim Project: fix opening remote zipfile " 2024 Aug 04 by Vim Project: escape '[' in name of file to be extracted +" 2024 Aug 05 by Vim Project: workaround for the FreeBSD's unzip " License: Vim License (see vim's :help license) " Copyright: Copyright (C) 2005-2019 Charles E. Campbell {{{1 " Permission is hereby granted to use and distribute this code, @@ -131,8 +132,7 @@ fun! zip#Browse(zipfile) \ '" Select a file with cursor and press ENTER']) keepj $ -" call Decho("exe silent r! ".g:zip_unzipcmd." -l -- ".s:Escape(a:zipfile,1)) - exe "keepj sil! r! ".g:zip_unzipcmd." -Z -1 -- ".s:Escape(a:zipfile,1) + exe $"keepj sil r! {g:zip_unzipcmd} -Z1 -- {s:Escape(a:zipfile, 1)}" if v:shell_error != 0 redraw! echohl WarningMsg | echo "***warning*** (zip#Browse) ".fnameescape(a:zipfile)." is not a zip file" | echohl None @@ -235,7 +235,7 @@ fun! zip#Read(fname,mode) " but allows zipfile://... entries in quickfix lists let temp = tempname() let fn = expand('%:p') - exe "sil! !".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fname,1).' > '.temp + exe "sil !".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fname,1).' > '.temp sil exe 'keepalt file '.temp sil keepj e! sil exe 'keepalt file '.fnameescape(fn) |