From 1290b2a96353631d0d956ed9311263e2369abfea Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 11 Apr 2024 19:14:56 +0300 Subject: [PATCH] Fix file names with embedded whitespace in Ediff * lisp/vc/ediff-ptch.el (ediff-patch-file-internal): Quote file names that can include special characters. (Bug#70329) (cherry picked from commit bbe98eddf70200228dc50b58f26f53351604cf83) --- lisp/vc/ediff-ptch.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el index f8d4c1c1c4b..2d5d4609890 100644 --- a/lisp/vc/ediff-ptch.el +++ b/lisp/vc/ediff-ptch.el @@ -721,10 +721,11 @@ optional argument, then use it." nil ; don't redisplay shell-command-switch ; usually -c (format "%s %s %s %s" - ediff-patch-program + (shell-quote-argument ediff-patch-program) ediff-patch-options ediff-backup-specs - (ediff--buffer-file-name buf-to-patch)) + (shell-quote-argument + (ediff--buffer-file-name buf-to-patch))) )) ;; restore environment for gnu patch -- 2.39.5