From cbe142d3a4cd0a33b68d316d8cda26b68de75399 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 30 Mar 2026 19:32:55 +0800 Subject: [PATCH] vim-patch:068c060: runtime(rustfmt): not correctly escaping directory names (#38597) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem: runtime(rustfmt): not correctly escaping directory names Solution: Use fnamescape() (Michał Majchrowicz) https://github.com/vim/vim/commit/068c0604c95e76f0f98984f908747deba94ed155 Co-authored-by: Christian Brabandt --- runtime/autoload/rustfmt.vim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/runtime/autoload/rustfmt.vim b/runtime/autoload/rustfmt.vim index 3d905296a6..771c95a877 100644 --- a/runtime/autoload/rustfmt.vim +++ b/runtime/autoload/rustfmt.vim @@ -3,7 +3,7 @@ " Last Change: " 2025 Oct 27 by Vim project: don't use rustfmt as 'formatprg' by default " 2026 Jan 25 by Vim project: don't hide rustfmt errors, restore default var -" +" 2026 Mar 30 by Vim project: use fnameescape for :chdir commands " " Adapted from https://github.com/fatih/vim-go " For bugs, patches and license go to https://github.com/rust-lang/rust.vim @@ -135,7 +135,7 @@ function! s:RunRustfmt(command, tmpname, from_writepre) " chdir to the directory of the file let l:has_lcd = haslocaldir() let l:prev_cd = getcwd() - execute 'lchdir! '.expand('%:h') + execute 'lchdir! ' . fnameescape(expand('%:h')) let l:buffer = getline(1, '$') if exists("*systemlist") @@ -215,6 +215,7 @@ function! s:RunRustfmt(command, tmpname, from_writepre) endif " Restore the current directory if needed + let l:prev_cd = fnameescape(l:prev_cd) if a:tmpname ==# '' if l:has_lcd execute 'lchdir! '.l:prev_cd