From 1fc85daee037058b772d7fa2726bc939fae4720c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20Gro=C3=9Fjohann?= Date: Sun, 22 Sep 2002 13:01:10 +0000 Subject: * 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. --- lisp/net/ange-ftp.el | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lisp/net') diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 54f954dde05..13c23245439 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -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))) -- cgit v1.2.1