From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 11 Apr 2024 16:14:56 +0000 (+0300)
Subject: Fix file names with embedded whitespace in Ediff
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1290b2a96353631d0d956ed9311263e2369abfea;p=emacs.git

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)
---

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