From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 28 Oct 2023 09:06:21 +0000 (-0400)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e81e625ab895f1bd3c5263f5b66251db0fd38bd6;p=emacs.git

Merge from origin/emacs-29

aa253c533d2 ; Fix broken links to gmane.org
cc3e436c822 Change news.gmane.org to news.gmane.io
297fe945c57 Fix minor defcustom issues in Gnus (Bug#66715)
3beb5f5e240 ; * doc/misc/gnus.texi: Fix unmatched quote in gnus doc. ...
85d08d5788e Minor connection-local variables fixes
79d8328ca4a Make Dired honor `insert-directory-program´ with globs
43127294e13 Fix typo in url-privacy-level :type
380f8574ef5 * lisp/vc/log-view.el (log-view-mode-menu): Quote derived...
---

e81e625ab895f1bd3c5263f5b66251db0fd38bd6
diff --cc etc/publicsuffix.txt
index 456b8aeaf0b,60d72fd0d53..956110851a4
--- a/etc/publicsuffix.txt
+++ b/etc/publicsuffix.txt
@@@ -14413,20 -13671,6 +14413,20 @@@ bounty-full.co
  alpha.bounty-full.com
  beta.bounty-full.com
  
 +// Smallregistry by Promopixel SARL: https://www.smallregistry.net
- // Former AFNIC's SLDs 
++// Former AFNIC's SLDs
 +// Submitted by Jérôme Lipowicz <support@promopixel.com>
 +aeroport.fr
 +avocat.fr
 +chambagri.fr
 +chirurgiens-dentistes.fr
 +experts-comptables.fr
 +medecin.fr
 +notaires.fr
 +pharmacien.fr
 +port.fr
 +veterinaire.fr
 +
  // Small Technology Foundation : https://small-tech.org
  // Submitted by Aral Balkan <aral@small-tech.org>
  small-web.org
diff --cc lisp/dired.el
index cc8c74839b9,f81e49a6b00..231d305210b
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@@ -1680,8 -1658,16 +1680,10 @@@ see `dired-use-ls-dired' for more detai
      (let ((dir-wildcard (insert-directory-wildcard-in-dir-p dir)))
        (cond (dir-wildcard
               (setq switches (concat "-d " switches))
 -             ;; We don't know whether the remote ls supports
 -             ;; "--dired", so we cannot add it to the `process-file'
 -             ;; call for wildcards.
 -             (when (file-remote-p dir)
 -               (setq switches (string-replace "--dired" "" switches)))
               (let* ((default-directory (car dir-wildcard))
-                     (script (format "ls %s %s" switches (cdr dir-wildcard)))
+                     (script (format "%s %s %s"
+                                     insert-directory-program
+                                     switches (cdr dir-wildcard)))
 -                    (remotep (file-remote-p dir))
                      (sh (or (and remotep "/bin/sh")
                              (executable-find shell-file-name)
                              (executable-find "sh")))