From 52ff5e3032eb5e39b49ce6f4e9a93cffdd39b830 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 7 Feb 2025 17:10:51 +0800 Subject: vim-patch:b69cd52: runtime(misc): Add support for lz4 to tar & gzip plugin (#32360) while at it, clean up the tar plugin a bit and sort the patterns for the tar and gzip plugin References: - https://github.com/lz4/lz4 - https://lz4.org/ closes: vim/vim#16591 https://github.com/vim/vim/commit/b69cd52447584cedadc1513aa3acd5b4cd9f4340 Co-authored-by: Corpulent Robin <177767857+corpulentrobin@users.noreply.github.com> --- runtime/plugin/gzip.vim | 54 +++++++++++++++++++++++++------------------- runtime/plugin/tarPlugin.vim | 15 +++++++----- 2 files changed, 40 insertions(+), 29 deletions(-) (limited to 'runtime/plugin') diff --git a/runtime/plugin/gzip.vim b/runtime/plugin/gzip.vim index c02bd99567..b431b5ba80 100644 --- a/runtime/plugin/gzip.vim +++ b/runtime/plugin/gzip.vim @@ -1,6 +1,6 @@ " Vim plugin for editing compressed files. " Maintainer: The Vim Project -" Last Change: 2023 Aug 10 +" Last Change: 2025 Feb 06 " Former Maintainer: Bram Moolenaar " Exit quickly when: @@ -20,42 +20,50 @@ augroup gzip " The functions are defined in autoload/gzip.vim. " " Set binary mode before reading the file. - " Use "gzip -d", gunzip isn't always available. - autocmd BufReadPre,FileReadPre *.gz,*.bz2,*.Z,*.lzma,*.xz,*.lz,*.zst,*.br,*.lzo setlocal bin - autocmd BufReadPost,FileReadPost *.gz call gzip#read("gzip -dn") + autocmd BufReadPre,FileReadPre *.gz,*.bz2,*.Z,*.lzma,*.xz,*.lz,*.zst,*.br,*.lzo,*.lz4 setlocal bin + + " Use "gzip -d" and similar commands, gunzip isn't always available. + autocmd BufReadPost,FileReadPost *.br call gzip#read("brotli -d --rm") autocmd BufReadPost,FileReadPost *.bz2 call gzip#read("bzip2 -d") - autocmd BufReadPost,FileReadPost *.Z call gzip#read("uncompress") + autocmd BufReadPost,FileReadPost *.gz call gzip#read("gzip -dn") + autocmd BufReadPost,FileReadPost *.lz call gzip#read("lzip -d") + autocmd BufReadPost,FileReadPost *.lz4 call gzip#read("lz4 -d -q --rm") autocmd BufReadPost,FileReadPost *.lzma call gzip#read("lzma -d") + autocmd BufReadPost,FileReadPost *.lzo call gzip#read("lzop -d -U") autocmd BufReadPost,FileReadPost *.xz call gzip#read("xz -d") - autocmd BufReadPost,FileReadPost *.lz call gzip#read("lzip -d") + autocmd BufReadPost,FileReadPost *.Z call gzip#read("uncompress") autocmd BufReadPost,FileReadPost *.zst call gzip#read("zstd -d --rm") - autocmd BufReadPost,FileReadPost *.br call gzip#read("brotli -d --rm") - autocmd BufReadPost,FileReadPost *.lzo call gzip#read("lzop -d -U") - autocmd BufWritePost,FileWritePost *.gz call gzip#write("gzip") + + autocmd BufWritePost,FileWritePost *.br call gzip#write("brotli --rm") autocmd BufWritePost,FileWritePost *.bz2 call gzip#write("bzip2") - autocmd BufWritePost,FileWritePost *.Z call gzip#write("compress -f") + autocmd BufWritePost,FileWritePost *.gz call gzip#write("gzip") + autocmd BufWritePost,FileWritePost *.lz call gzip#write("lzip") + autocmd BufWritePost,FileWritePost *.lz4 call gzip#write("lz4 -q --rm") autocmd BufWritePost,FileWritePost *.lzma call gzip#write("lzma -z") + autocmd BufWritePost,FileWritePost *.lzo call gzip#write("lzop -U") autocmd BufWritePost,FileWritePost *.xz call gzip#write("xz -z") - autocmd BufWritePost,FileWritePost *.lz call gzip#write("lzip") + autocmd BufWritePost,FileWritePost *.Z call gzip#write("compress -f") autocmd BufWritePost,FileWritePost *.zst call gzip#write("zstd --rm") - autocmd BufWritePost,FileWritePost *.br call gzip#write("brotli --rm") - autocmd BufWritePost,FileWritePost *.lzo call gzip#write("lzop -U") - autocmd FileAppendPre *.gz call gzip#appre("gzip -dn") + + autocmd FileAppendPre *.br call gzip#appre("brotli -d --rm") autocmd FileAppendPre *.bz2 call gzip#appre("bzip2 -d") - autocmd FileAppendPre *.Z call gzip#appre("uncompress") + autocmd FileAppendPre *.gz call gzip#appre("gzip -dn") + autocmd FileAppendPre *.lz call gzip#appre("lzip -d") + autocmd FileAppendPre *.lz4 call gzip#appre("lz4 -d -q --rm") autocmd FileAppendPre *.lzma call gzip#appre("lzma -d") + autocmd FileAppendPre *.lzo call gzip#appre("lzop -d -U") autocmd FileAppendPre *.xz call gzip#appre("xz -d") - autocmd FileAppendPre *.lz call gzip#appre("lzip -d") + autocmd FileAppendPre *.Z call gzip#appre("uncompress") autocmd FileAppendPre *.zst call gzip#appre("zstd -d --rm") - autocmd FileAppendPre *.br call gzip#appre("brotli -d --rm") - autocmd FileAppendPre *.lzo call gzip#appre("lzop -d -U") - autocmd FileAppendPost *.gz call gzip#write("gzip") + + autocmd FileAppendPost *.br call gzip#write("brotli --rm") autocmd FileAppendPost *.bz2 call gzip#write("bzip2") - autocmd FileAppendPost *.Z call gzip#write("compress -f") + autocmd FileAppendPost *.gz call gzip#write("gzip") + autocmd FileAppendPost *.lz call gzip#write("lzip") + autocmd FileAppendPost *.lz4 call gzip#write("lz4 --rm") autocmd FileAppendPost *.lzma call gzip#write("lzma -z") + autocmd FileAppendPost *.lzo call gzip#write("lzop -U") autocmd FileAppendPost *.xz call gzip#write("xz -z") - autocmd FileAppendPost *.lz call gzip#write("lzip") + autocmd FileAppendPost *.Z call gzip#write("compress -f") autocmd FileAppendPost *.zst call gzip#write("zstd --rm") - autocmd FileAppendPost *.br call gzip#write("brotli --rm") - autocmd FileAppendPost *.lzo call gzip#write("lzop -U") augroup END diff --git a/runtime/plugin/tarPlugin.vim b/runtime/plugin/tarPlugin.vim index 26a994aee5..64266fd3f2 100644 --- a/runtime/plugin/tarPlugin.vim +++ b/runtime/plugin/tarPlugin.vim @@ -1,4 +1,5 @@ " tarPlugin.vim -- a Vim plugin for browsing tarfiles +" " Original was copyright (c) 2002, Michael C. Toren " Modified by Charles E. Campbell " Distributed under the GNU General Public License. @@ -34,18 +35,20 @@ augroup tar au FileWriteCmd tarfile::*/* call tar#Write(expand("")) endif - au BufReadCmd *.tar.gz call tar#Browse(expand("")) - au BufReadCmd *.tar call tar#Browse(expand("")) au BufReadCmd *.lrp call tar#Browse(expand("")) + au BufReadCmd *.tar call tar#Browse(expand("")) au BufReadCmd *.tar.bz2 call tar#Browse(expand("")) + au BufReadCmd *.tar.gz call tar#Browse(expand("")) + au BufReadCmd *.tar.lz4 call tar#Browse(expand("")) + au BufReadCmd *.tar.lzma call tar#Browse(expand("")) + au BufReadCmd *.tar.xz call tar#Browse(expand("")) au BufReadCmd *.tar.Z call tar#Browse(expand("")) + au BufReadCmd *.tar.zst call tar#Browse(expand("")) au BufReadCmd *.tbz call tar#Browse(expand("")) au BufReadCmd *.tgz call tar#Browse(expand("")) - au BufReadCmd *.tar.lzma call tar#Browse(expand("")) - au BufReadCmd *.tar.xz call tar#Browse(expand("")) + au BufReadCmd *.tlz4 call tar#Browse(expand("")) au BufReadCmd *.txz call tar#Browse(expand("")) - au BufReadCmd *.tar.zst call tar#Browse(expand("")) - au BufReadCmd *.tzst call tar#Browse(expand("")) + au BufReadCmd *.tzst call tar#Browse(expand("")) augroup END " --------------------------------------------------------------------- -- cgit