From: Juri Linkov <juri@linkov.net>
Date: Sun, 7 Jul 2024 06:57:34 +0000 (+0300)
Subject: * lisp/files.el (insert-directory): Quote switches in wildcard case.
X-Git-Tag: archive/raspbian/1%30.1+1-3+rpi1^2~2^2~20^2~763
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b249f022f1285aaf02705b6ac239d95e3b413c18;p=emacs.git

* lisp/files.el (insert-directory): Quote switches in wildcard case.

Use shell-quote-wildcard-pattern on the switches string split by
split-string-and-unquote.  This helps to quote such switches as
"--block-size='1" (bug#71935).
---

diff --git a/lisp/files.el b/lisp/files.el
index 2fda10fc50e..e552f3ac413 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -8193,9 +8193,15 @@ normally equivalent short `-D' option is just passed on to
 				 "\\") ; Disregard Unix shell aliases!
 			       insert-directory-program
 			       " -d "
-			       (if (stringp switches)
-				   switches
-				 (mapconcat #'identity switches " "))
+			       ;; Quote switches that require quoting
+			       ;; such as "--block-size='1".  But don't
+			       ;; quote switches that use patterns
+			       ;; such as "--ignore=PATTERN" (bug#71935).
+			       (mapconcat #'shell-quote-wildcard-pattern
+					  (if (stringp switches)
+					      (split-string-and-unquote switches)
+					    switches)
+					  " ")
 			       " -- "
 			       ;; Quote some characters that have
 			       ;; special meanings in shells; but