procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Richard M. Stallman 2001-12-29 02:50:51 +00:00
parent 91074c048b
commit 8839c4a651
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/ChangeLog
View file

@ -2,6 +2,7 @@
* net/ange-ftp.el (ange-ftp-allow-child-lookup): Always return nil. * net/ange-ftp.el (ange-ftp-allow-child-lookup): Always return nil.
This fixes a bug that treated all files as directories. 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 * international/iso-transl.el (iso-transl-char-map) Eliminate the
alias symbols--put the translated sequences here directly. alias symbols--put the translated sequences here directly.

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

@ -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) (defun ange-ftp-insert-directory (file switches &optional wildcard full)
(let ((short (ange-ftp-abbreviate-filename file)) (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 (if parsed
(insert (if (and (not wildcard)
(if wildcard (setq tem (file-symlink-p (directory-file-name file))))
(let ((default-directory (file-name-directory file))) (ange-ftp-insert-directory
(ange-ftp-ls (file-name-nondirectory file) switches nil nil t)) (ange-ftp-replace-name-component file tem)
(ange-ftp-ls file switches full))) 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)))) (ange-ftp-real-insert-directory file switches wildcard full))))
(defun ange-ftp-dired-uncache (dir) (defun ange-ftp-dired-uncache (dir)