diff options
| author | Michael Albinus | 2010-01-29 17:23:25 +0100 |
|---|---|---|
| committer | Michael Albinus | 2010-01-29 17:23:25 +0100 |
| commit | e5c70c411776fb6e8cc29bc155d1f1584933268b (patch) | |
| tree | 8f55bb6c8cd117109ee5e3210aede198cf6d55b0 /lisp | |
| parent | af93af83df6af83408f5940d017baf8637ec1bf1 (diff) | |
| download | emacs-e5c70c411776fb6e8cc29bc155d1f1584933268b.tar.gz emacs-e5c70c411776fb6e8cc29bc155d1f1584933268b.zip | |
* net/tramp.el (tramp-handle-insert-directory): Handle also
symlinks, when FILENAME is not in `default-directory'.
Diffstat (limited to 'lisp')
| -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 03617962164..f8edcd6f38e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,7 +1,12 @@ | |||
| 1 | 2010-01-29 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-handle-insert-directory): Handle also | ||
| 4 | symlinks, when FILENAME is not in `default-directory'. | ||
| 5 | |||
| 1 | 2010-01-28 Michael Albinus <michael.albinus@gmx.de> | 6 | 2010-01-28 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 7 | ||
| 3 | * net/ange-ftp.el (ange-ftp-insert-directory): Handle the case, | 8 | * net/ange-ftp.el (ange-ftp-insert-directory): Handle the case, |
| 4 | FILENAME is not in `default-directory'. (Bug#5478) | 9 | FILE is not in `default-directory'. (Bug#5478) |
| 5 | 10 | ||
| 6 | * net/tramp.el (tramp-handle-insert-directory): Simplify handling | 11 | * net/tramp.el (tramp-handle-insert-directory): Simplify handling |
| 7 | of SWITCHES. Handle the case, FILENAME is not in | 12 | 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." | |||
| 4147 | ;; The inserted file could be from somewhere else. | 4147 | ;; The inserted file could be from somewhere else. |
| 4148 | (when (and (not wildcard) (not full-directory-p)) | 4148 | (when (and (not wildcard) (not full-directory-p)) |
| 4149 | (goto-char (point-max)) | 4149 | (goto-char (point-max)) |
| 4150 | (when (file-symlink-p filename) | ||
| 4151 | (goto-char (search-backward "->" beg 'noerror))) | ||
| 4150 | (search-backward | 4152 | (search-backward |
| 4151 | (if (zerop (length (file-name-nondirectory filename))) | 4153 | (if (zerop (length (file-name-nondirectory filename))) |
| 4152 | "." | 4154 | "." |