Re: master c150777f498 4/4: Fix merge snafu in dired-aux.el

On Sat,  1 Aug 2026 07:38:43 -0400 (EDT) Eli Zaretskii <[email protected]> wrote:

> branch: master
> commit c150777f4980309243aabbb6678187706acdceaa
> Author: Eli Zaretskii <[email protected]>
> Commit: Eli Zaretskii <[email protected]>
>
>     Fix merge snafu in dired-aux.el
>     
>     * lisp/dired-aux.el (dired-insert-subdir): Replace call
>     to 'dired--ls-accept-b-switch-p' (which no longer exists)
>     with equivalent code.
> ---
>  lisp/dired-aux.el | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
> index 6380b3be627..b6ee35ff39b 100644
> --- a/lisp/dired-aux.el
> +++ b/lisp/dired-aux.el
> @@ -3409,7 +3409,8 @@ and the related messages for details."))
>                  (dired-switches-escape-p dired-listing-switches)
>                  (dired-switches-escape-p dired-actual-switches))
>        (when (and (dired--filename-with-newline-p)
> -                 (dired--ls-accept-b-switch-p))
> +                 (eq 0 (call-process insert-directory-program
> +                                     nil nil nil "-b")))
>          (dired--display-filename-with-newline-warning (current-buffer))))
>      (dired-initial-position dirname)
>      (save-excursion (dired-mark-remembered mark-alist))

Thanks for catching this oversight of mine.  However, instead of
inlining the body of the removed function `dired--ls-accept-b-switch-p',
the call to the latter should be replaced by
`(dired--check-use-ls-dired)', since bug#81481 showed that the Dired
handling of file names with newlines depends on 'ls' supporting --dired
rather than -b.  I've made that change now in commit cb22cfe1414.
(Sorry for the late reply; I was traveling and only got to it now.)

Steve Berman