Mercurial > emacs
changeset 107044:28bc861d56c5
* net/tramp.el (tramp-handle-insert-directory): Handle also
symlinks, when FILENAME is not in `default-directory'.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Fri, 29 Jan 2010 17:23:25 +0100 |
| parents | 3809515a97b5 |
| children | 435c323b6002 |
| files | lisp/ChangeLog lisp/net/tramp.el |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Jan 29 16:03:25 2010 +0200 +++ b/lisp/ChangeLog Fri Jan 29 17:23:25 2010 +0100 @@ -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
--- a/lisp/net/tramp.el Fri Jan 29 16:03:25 2010 +0200 +++ b/lisp/net/tramp.el Fri Jan 29 17:23:25 2010 +0100 @@ -4147,6 +4147,8 @@ ;; 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))) "."