diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2010-01-29 17:23:25 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2010-01-29 17:23:25 +0100 |
| commit | 32d6b4da213cfa2b8a72965cc5e0cb5a26365c3c (patch) | |
| tree | 09f20d7ddbced1d52ebf81c218076383710948e5 | |
| parent | fe17273e5eda1fd5025daec6bcd9071b2421be1f (diff) | |
| download | emacs-32d6b4da213cfa2b8a72965cc5e0cb5a26365c3c.tar.gz | |
* net/tramp.el (tramp-handle-insert-directory): Handle also
symlinks, when FILENAME is not in `default-directory'.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4020daccc72..43f675c9d2e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,12 @@ +2010-01-29 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-handle-insert-directory): Handle also + symlinks, when FILENAME is not in `default-directory'. + 2010-01-28 Michael Albinus <michael.albinus@gmx.de> * net/ange-ftp.el (ange-ftp-insert-directory): Handle the case, - FILENAME is not in `default-directory'. (Bug#5478) + FILE is not in `default-directory'. (Bug#5478) * net/tramp.el (tramp-handle-insert-directory): Simplify handling of SWITCHES. Handle the case, FILENAME is not in diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 9e8522f3db0..28a30155a66 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4147,6 +4147,8 @@ This is like `dired-recursive-delete-directory' for Tramp files." ;; The inserted file could be from somewhere else. (when (and (not wildcard) (not full-directory-p)) (goto-char (point-max)) + (when (file-symlink-p filename) + (goto-char (search-backward "->" beg 'noerror))) (search-backward (if (zerop (length (file-name-nondirectory filename))) "." |