]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix file names with embedded whitespace in Ediff
authorEli Zaretskii <eliz@gnu.org>
Thu, 11 Apr 2024 16:14:56 +0000 (19:14 +0300)
committerEshel Yaron <me@eshelyaron.com>
Sun, 14 Apr 2024 16:59:18 +0000 (18:59 +0200)
* 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

index f8d4c1c1c4b24c695a1899b103088dfbc7169b5b..2d5d46098905663eff90ea40a3ee191f0a706a70 100644 (file)
@@ -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