[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/android 84ffda4be56: Merge remote-tracking branch 'origin/master
From: |
Po Lu |
Subject: |
feature/android 84ffda4be56: Merge remote-tracking branch 'origin/master' into feature/android |
Date: |
Sat, 18 Mar 2023 03:35:05 -0400 (EDT) |
branch: feature/android
commit 84ffda4be5670696259622d03ff7e35799554888
Merge: 90348dabbf1 95d5154feed
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>
Merge remote-tracking branch 'origin/master' into feature/android
---
lisp/find-dired.el | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 33376ee4ed9..db2f5e7d026 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -50,8 +50,13 @@ than the latter."
:group 'find-dired
:type 'string)
+(defvar find-gnu-find-p
+ (eq 0 (ignore-errors
+ (process-file find-program nil nil nil null-device "--version")))
+ "Non-nil if `find-program' is a GNU Find, nil otherwise.")
+
(defvar find-ls-option-default-ls
- (cons "-ls" (if (eq system-type 'berkeley-unix) "-gilsb" "-dilsb")))
+ (cons "-ls" (if find-gnu-find-p "-dilsb" "-dgils")))
(defvar find-ls-option-default-exec
(cons (format "-exec ls -ld {} %s" find-exec-terminator) "-ld"))