From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#64791: 30.0.50; [PATCH] Fix dired mismatch on some filenames Date: Sun, 3 Sep 2023 11:54:07 -0700 Message-ID: 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> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="7418"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 64791@debbugs.gnu.org, manuel@ledu-giraud.fr To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Sep 03 20:55:42 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 1qcsG6-0001lL-OX for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 03 Sep 2023 20:55:42 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcsFV-0005rt-76; Sun, 03 Sep 2023 14:55:05 -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 1qcsFS-0005qE-UC for bug-gnu-emacs@gnu.org; Sun, 03 Sep 2023 14:55:02 -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 1qcsFS-0006jD-Ku for bug-gnu-emacs@gnu.org; Sun, 03 Sep 2023 14:55:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qcsFR-0005AY-RZ for bug-gnu-emacs@gnu.org; Sun, 03 Sep 2023 14:55:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 03 Sep 2023 18:55:01 +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.169376725919816 (code B ref 64791); Sun, 03 Sep 2023 18:55:01 +0000 Original-Received: (at 64791) by debbugs.gnu.org; 3 Sep 2023 18:54:19 +0000 Original-Received: from localhost ([127.0.0.1]:46925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcsEk-00059X-Kh for submit@debbugs.gnu.org; Sun, 03 Sep 2023 14:54:19 -0400 Original-Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]:58778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcsEf-00059H-U6 for 64791@debbugs.gnu.org; Sun, 03 Sep 2023 14:54:16 -0400 Original-Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-4ff8cf11b90so1239112e87.1 for <64791@debbugs.gnu.org>; Sun, 03 Sep 2023 11:54:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693767248; x=1694372048; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=WAe3z7RudiTTZztaHM6KFBhHWxBepXN1D7IQI6CuVFw=; b=O8PD/OKrL2CbstT4exek1HQmqEI0Q6bIpst4t6ywlScAEHxWAWZ5reHBK+c1i4WpG0 9tthZ2KVsEOUFe1BaxzIDYVGSg1cnI7MBMJaKs/zAFF0qK/1PfGqUQ4jTraVyAcA08bH Psecx44Iysy/pUqHcyK6FlatNV2k9T0cCIWcK63Iit/ySKS1X6EOpR3+4zMblJwu6q8k a2WSV5pT4V3SNFh6MTj5glAe8BIq9kJLbPXjm2iZITQsBCUdzK89NCeWtmAxISDdEsks edxrt/s//bGdXnTZ03R9oLQf1pjZD0obnKBwjO/gQpthRoZuYXkSOmMNyT5N7dDBr/6i 1jNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693767248; x=1694372048; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WAe3z7RudiTTZztaHM6KFBhHWxBepXN1D7IQI6CuVFw=; b=cZcZb10jggXmmItBVNisw7uXEx3LEULtPCbQyskmdZMOkeULJexoICHGedd8gDEle1 flXdN6IKLbYOZsqV3EbzzzgT+C+iOP6LCVrWob7X+OI3j2yNkTyxwF8I/qWq4xkZDNE6 y2JaMHgU861M0fu3VegZE5bRO/InnEQdepu/taoeshhP5cswvdqNxW9MBMX033QXusLR AoxWpCVgQCB4pvinJM0f8BOvGZIhGYytMmXq0tyWeQuijzsTp6cGAW9v3cCNJom6Ql8t AuvxZqNGm8rDlikBuh2GphFpuvCA0o4QNxtBzLht5Njc+Vb9FBD1R6ny7MPzMxJ9Us7m ag6w== X-Gm-Message-State: AOJu0YyI0FpO7ek03EDsSwtr5zkX/yBkaNQCW472dPLfIcS37joce0X6 iIN36Ib61GZkPn64JYfmSZ+zV39ml0sywTvBT2I= X-Google-Smtp-Source: AGHT+IGKeDaFBXD+0wbbUvapYk19KOIFm+9+7oAhJfZyNcG2A+4AdwUIMo+QokGPxlGVr2Gij3TAdSJUBWmb5EtTUh0= X-Received: by 2002:a19:674e:0:b0:500:a408:dbd with SMTP id e14-20020a19674e000000b00500a4080dbdmr4660936lfj.55.1693767248373; Sun, 03 Sep 2023 11:54:08 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sun, 3 Sep 2023 11:54:07 -0700 In-Reply-To: <83zg235d47.fsf@gnu.org> 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:269191 Archived-At: 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').") BTW, I see that doom-emacs has something much like this here: https://github.com/doomemacs/doomemacs/blob/7a7503045850ea83f205de6e71e6d886187f4a22/modules/emacs/dired/config.el#L33