mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-16 10:50:49 -08:00
Code Issues Projects Releases Wiki Activity

* dired.el (dired-insert-directory): Always add "--dired" to to

Browse source 
SWITCHES for remote files.
* files.el (insert-directory): Comment saying that "--dired"
might be in the SWITCHES.
* net/ange-ftp.el (ange-ftp-ls): Handle "--dired" in LSARGS.
(ange-ftp-insert-directory): Comment explaining "--dired"
handling.
This commit is contained in:
Kai Großjohann 2002-09-22 13:01:10 +00:00
parent f8aba1ce99
commit 1fc85daee0
4 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/ChangeLog
View file

@ -1,3 +1,13 @@
2002-09-22 Kai Gro,b_(Bjohann <grossjoh@ls6.informatik.uni-dortmund.de>
* dired.el (dired-insert-directory): Always add "--dired" to to
SWITCHES for remote files.
* files.el (insert-directory): Comment saying that "--dired"
might be in the SWITCHES.
* net/ange-ftp.el (ange-ftp-ls): Handle "--dired" in LSARGS.
(ange-ftp-insert-directory): Comment explaining "--dired"
handling.
2002-09-21 Markus Rost <rost@math.ohio-state.edu>
* mail/mailabbrev.el (mail-abbrev-make-syntax-table): Give %!._-

3
lisp/dired.el
View file

@ -677,8 +677,7 @@ If HDR is non-nil, insert a header line with the directory name."
(let ((opoint (point))
(process-environment (copy-sequence process-environment))
end)
(if (and dired-use-ls-dired
(not (file-remote-p dir)))
(if (or 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,

3
lisp/files.el
View file

@ -3969,6 +3969,9 @@ program specified by `directory-free-space-program' if that is non-nil."
;; dired-insert-headerline
;; dired-after-subdir-garbage (defines what a "total" line is)
;; - variable dired-subdir-regexp
;; - may be passed "--dired" as the first argument in SWITCHES.
;; Filename handlers might have to remove this switch if their
;; "ls" command does not support it.
(defun insert-directory (file switches &optional wildcard full-directory-p)
"Insert directory listing for FILE, formatted according to SWITCHES.
Leaves point after the inserted text.

5
lisp/net/ange-ftp.el
View file

@ -2527,6 +2527,8 @@ which can parse the output from a DIR listing for a host of type TYPE.")
FILE is the full name of the remote file, LSARGS is any args to pass to the
`ls' command, and PARSE specifies that the output should be parsed and stored
away in the internal cache."
(when (string-match "^--dired\\s-+" lsargs)
(setq lsargs (replace-match "" nil t lsargs)))
;; If parse is t, we assume that file is a directory. i.e. we only parse
;; full directory listings.
(let* ((ange-ftp-this-file (ange-ftp-expand-file-name file))
@ -4417,6 +4419,9 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
;; I have preserved (and modernized) those hooks.
;; So the format conversion should be all that is needed.
;; When called from dired, SWITCHES may start with "--dired".
;; `ange-ftp-ls' handles this.
(defun ange-ftp-insert-directory (file switches &optional wildcard full)
(let ((short (ange-ftp-abbreviate-filename file))
(parsed (ange-ftp-ftp-name (expand-file-name file)))