Commit 8839c4a6 authored by Richard M. Stallman's avatar Richard M. Stallman

(ange-ftp-insert-directory): Explicitly follow symlinks.

parent 91074c04
......@@ -2,6 +2,7 @@
* net/ange-ftp.el (ange-ftp-allow-child-lookup): Always return nil.
This fixes a bug that treated all files as directories.
(ange-ftp-insert-directory): Explicitly follow symlinks.
* international/iso-transl.el (iso-transl-char-map) Eliminate the
alias symbols--put the translated sequences here directly.
......
......@@ -4380,13 +4380,19 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
(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))))
(parsed (ange-ftp-ftp-name (expand-file-name file)))
tem)
(if parsed
(insert
(if wildcard
(let ((default-directory (file-name-directory file)))
(ange-ftp-ls (file-name-nondirectory file) switches nil nil t))
(ange-ftp-ls file switches full)))
(if (and (not wildcard)
(setq tem (file-symlink-p (directory-file-name file))))
(ange-ftp-insert-directory
(ange-ftp-replace-name-component file tem)
switches wildcard full)
(insert
(if wildcard
(let ((default-directory (file-name-directory file)))
(ange-ftp-ls (file-name-nondirectory file) switches nil nil t))
(ange-ftp-ls file switches full))))q
(ange-ftp-real-insert-directory file switches wildcard full))))
(defun ange-ftp-dired-uncache (dir)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment