Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Dired on DOS/Windows.

Browse source 
dired.el (dired-insert-directory): Don't invoke `ls' when
 ls-lisp.el is used to emulate it.
This commit is contained in:
Eli Zaretskii 2011-02-02 18:21:52 +02:00
parent aa2d499cd6
commit bc35ff325b
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2011-02-02 Eli Zaretskii <eliz@gnu.org>
* dired.el (dired-insert-directory): Don't invoke `ls' when
ls-lisp.el is used to emulate it.
2011-02-01 Julien Danjou <julien@danjou.info>
* color.el (color-gradient): Add a color-gradient function.

24
lisp/dired.el
View file

@ -1052,6 +1052,8 @@ BEG..END is the line where the file info is located."
(set-marker file nil)))))
(defvar ls-lisp-use-insert-directory-program)
(defun dired-insert-directory (dir switches &optional file-list wildcard hdr)
"Insert a directory listing of DIR, Dired style.
Use SWITCHES to make the listings.
@ -1063,14 +1065,20 @@ 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 (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))
(if (and
;; Don't try to invoke `ls' if we are on DOS/Windows where
;; ls-lisp emulation is used, except if they want to use `ls'
;; as indicated by `ls-lisp-use-insert-directory-program'.
(not (and (featurep 'ls-lisp)
(null ls-lisp-use-insert-directory-program)))
(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,