Skip to content

Commit 6d606b2

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents 05a0f0e + 794c304 commit 6d606b2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1080
-1020
lines changed

runtime/autoload/dist/vim9.vim

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ vim9script
33
# Vim runtime support library
44
#
55
# Maintainer: The Vim Project <https://github.com/vim/vim>
6-
# Last Change: 2026 Mar 10
6+
# Last Change: 2026 Apr 06
77

88
export def IsSafeExecutable(filetype: string, executable: string): bool
99
if empty(exepath(executable))
@@ -62,7 +62,7 @@ if has('unix')
6262
export def Launch(args: string)
6363
# Use job_start, because using !xdg-open is known not to work with zsh
6464
# ignore signals on exit
65-
job_start(split(args), {'stoponexit': ''})
65+
job_start(['sh', '-c', args], {'stoponexit': '', 'in_io': 'null', 'out_io': 'null', 'err_io': 'null'})
6666
enddef
6767
endif
6868
elseif has('win32')
@@ -139,13 +139,7 @@ export def Open(file: string)
139139
setlocal shell&
140140
defer setbufvar('%', '&shell', shell)
141141
endif
142-
if has('unix') && !has('win32unix') && !exists('$WSL_DISTRO_NAME')
143-
# Linux: using job_start, so do not use shellescape.
144-
Launch($"{Viewer()} {file}")
145-
else
146-
# Windows/WSL/Cygwin: NEEDS shellescape because Launch uses '!'
147-
Launch($"{Viewer()} {shellescape(file, 1)}")
148-
endif
142+
Launch($"{Viewer()} {shellescape(file, 1)}")
149143
enddef
150144

151145
# Uncomment this line to check for compilation errors early

runtime/autoload/tar.vim

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
" 2025 Jul 16 by Vim Project: update minimum vim version
2121
" 2026 Feb 06 by Vim Project: consider 'nowrapscan' (#19333)
2222
" 2026 Feb 07 by Vim Project: make the path traversal detection more robust (#19341)
23+
" 2026 Apr 06 by Vim Project: fix bugs with lz4 support (#19925)
2324
"
2425
" Contains many ideas from Michael Toren's <tar.vim>
2526
"
@@ -704,7 +705,9 @@ fun! tar#Extract()
704705
endif
705706

706707
elseif filereadable(tarbase.".tlz4")
707-
let extractcmd= substitute(extractcmd,"-","-I lz4","")
708+
if has("linux")
709+
let extractcmd= substitute(extractcmd,"-","-I lz4 -","")
710+
endif
708711
call system(extractcmd." ".shellescape(tarbase).".tlz4 ".shellescape(fname))
709712
if v:shell_error != 0
710713
call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tlz4 {fname}: failed!")
@@ -713,8 +716,10 @@ fun! tar#Extract()
713716
endif
714717

715718
elseif filereadable(tarbase.".tar.lz4")
716-
let extractcmd= substitute(extractcmd,"-","-I lz4","")
717-
call system(extractcmd." ".shellescape(tarbase).".tar.lz4".shellescape(fname))
719+
if has("linux")
720+
let extractcmd= substitute(extractcmd,"-","-I lz4 -","")
721+
endif
722+
call system(extractcmd." ".shellescape(tarbase).".tar.lz4 ".shellescape(fname))
718723
if v:shell_error != 0
719724
call s:Msg('tar#Extract', 'error', $"{extractcmd} {tarbase}.tar.lz4 {fname}: failed!")
720725
else

0 commit comments

Comments
 (0)