mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-05 11:45:45 +00:00
Code Issues Releases Activity

Smarter initialization for dired-use-ls-dired (Bug#7546).

Browse Source 
* lisp/dired.el (dired-use-ls-dired): Set default to a special
"unspecified" value.
(dired-insert-directory): When called the first time, check
whether "ls --dired" succeeds and set dired-use-ls-dired (Bug#7546).
This commit is contained in:
Chong Yidong 2010-12-04 17:10:12 -05:00
parent d6a003a8b5
commit 8c44f09771
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -1,3 +1,10 @@
2010-12-04 Chong Yidong <cyd@stupidchicken.com>
* dired.el (dired-use-ls-dired): Set default to a special
"unspecified" value.
(dired-insert-directory): When called the first time, check
whether "ls --dired" succeeds and set dired-use-ls-dired (Bug#7546).
2010-12-04 Tak Ota <Takaaki.Ota@am.sony.com>
* replace.el: Add "collect" feature to occur.

16
lisp/dired.el
View File

@ -80,8 +80,11 @@ If nil, `dired-listing-switches' is used.")
"/etc/chown")))
"Name of chown command (usually `chown' or `/etc/chown').")
(defvar dired-use-ls-dired (not (not (string-match "gnu" system-configuration)))
"Non-nil means Dired should use `ls --dired'.")
(defvar dired-use-ls-dired 'unspecified
"Non-nil means Dired should use \"ls --dired\".
The special value of `unspecified' means to check explicitly, and
save the result in this variable. This is performed the first
time `dired-insert-directory' is called.")
(defvar dired-chmod-program "chmod"
"Name of chmod command (usually `chmod').")
@ -1057,7 +1060,14 @@ If HDR is non-nil, insert a header line with the directory name."
(let ((opoint (point))
(process-environment (copy-sequence process-environment))
end)
(if (or dired-use-ls-dired (file-remote-p dir))
(if (or (if (eq dired-use-ls-dired 'unspecified)
;; Check whether "ls --dired" gives exit code 0, and
;; save the answer in `dired-use-ls-dired'.
(setq dired-use-ls-dired
(eq (call-process insert-directory-program nil nil nil "--dired")
0))
dired-use-ls-dired)
(file-remote-p dir))
(setq switches (concat "--dired " switches)))
;; We used to specify the C locale here, to force English month names;
;; but this should not be necessary any more,