From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#64791: 30.0.50; [PATCH] Fix dired mismatch on some filenames Date: Sun, 03 Sep 2023 22:25:30 +0300 Message-ID: <83wmx75aad.fsf@gnu.org> References: <87sf9gozbl.fsf@ledu-giraud.fr> <83fs5g8392.fsf@gnu.org> <87lef8ovgc.fsf@ledu-giraud.fr> <835y6c7yvo.fsf@gnu.org> <87ttsbbbfy.fsf@ledu-giraud.fr> <83zg235d47.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="38367"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 64791@debbugs.gnu.org, manuel@ledu-giraud.fr To: Stefan Kangas Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Sep 03 21:27:27 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qcsko-0009lt-Ta for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 03 Sep 2023 21:27:26 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcskV-000243-Qu; Sun, 03 Sep 2023 15:27:08 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qcskR-000218-CK for bug-gnu-emacs@gnu.org; Sun, 03 Sep 2023 15:27:03 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qcskR-0007qJ-4A for bug-gnu-emacs@gnu.org; Sun, 03 Sep 2023 15:27:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qcskQ-0005vQ-7T for bug-gnu-emacs@gnu.org; Sun, 03 Sep 2023 15:27:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 03 Sep 2023 19:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64791 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 64791-submit@debbugs.gnu.org id=B64791.169376916322709 (code B ref 64791); Sun, 03 Sep 2023 19:27:02 +0000 Original-Received: (at 64791) by debbugs.gnu.org; 3 Sep 2023 19:26:03 +0000 Original-Received: from localhost ([127.0.0.1]:46954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcsjT-0005uC-4A for submit@debbugs.gnu.org; Sun, 03 Sep 2023 15:26:03 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcsjO-0005tg-QW for 64791@debbugs.gnu.org; Sun, 03 Sep 2023 15:26:02 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qcsjJ-0007g0-2n; Sun, 03 Sep 2023 15:25:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=BAiZALouGzaZ6F+Fo6GpteDw+uk0+k9rLcsy8MChcQU=; b=fNR9EckF0prz Yh3GPsFFKIs9+94h7aSyW7yKr/jHe7GYTj+bxcZAAtkILdYepkDj2OdHL6y/LDtYm2llZPVxuFaJ8 elYrOQJ09Exl9bUthZN+itF/mnW19gSdCmu31/Zr9Brg3/g0KnZzFbx1GF0Q4CWC8PpFFQoqNwGLn Xoo+Os+QGryh0jjJebz6owGyKBjddruP7DbN2WOa370YAHxU2/lljLoEAxSQQd1tT5vaRFOgHEBmZ wd6kf7bLB4/2CcX4hpoxqkgRN8AiyZ9PXnAxrvsfToOibR0gIRFby9TJM6/lmgzONI9TJOhtsA1zj MbFo42vLaQZhg2kpTQKvkw==; In-Reply-To: (message from Stefan Kangas on Sun, 3 Sep 2023 11:54:07 -0700) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:269194 Archived-At: > From: Stefan Kangas > Date: Sun, 3 Sep 2023 11:54:07 -0700 > Cc: manuel@ledu-giraud.fr, 64791@debbugs.gnu.org > > Eli Zaretskii writes: > > > What about making insert-directory-program a defcustom, so that people > > who have GNU ls under a name other than "ls" could customize that? > > We could do that. It wouldn't help my case unfortunately, as I'm using > the same config on my GNU/Linux machines as well, so I have to do the > whole `executable-find' thing anyway. > > What do you think of something along these lines, which seems to work at > least on macOS and OpenBSD? If you agree, we could investigate if it > works on FreeBSD and NetBSD too. I *think* it will, but it's worth > checking to make sure. > > diff --git a/lisp/files.el b/lisp/files.el > index 4188615e490..88c4ecadc9a 100644 > --- a/lisp/files.el > +++ b/lisp/files.el > @@ -7723,7 +7723,11 @@ shell-quote-wildcard-pattern > pattern)))) > > > -(defvar insert-directory-program (purecopy "ls") > +(defvar insert-directory-program > + (if (and (memq system-type '(berkeley-unix darwin)) > + (executable-find "gls")) > + (purecopy "gls") > + (purecopy "ls")) > "Absolute or relative name of the `ls'-like program. > This is used by `insert-directory' and `dired-insert-directory' > \(thus, also by `dired').") If we believe "gls" is the only popular name, I guess that's good enough.