[Emacs-diffs] /srv/bzr/emacs/trunk r99411: * net/tramp.el (tramp-handle-insert-directory): Handle also

[Michael Albinus]

------------------------------------------------------------
revno: 99411
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Fri 2010-01-29 17:23:25 +0100
message:
  * net/tramp.el (tramp-handle-insert-directory): Handle also
  symlinks, when FILENAME is not in `default-directory'.
modified:
  lisp/ChangeLog
  lisp/net/tramp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-28 21:13:01 +0000
+++ b/lisp/ChangeLog    2010-01-29 16:23:25 +0000
@@ -1,7 +1,12 @@
+2010-01-29  Michael Albinus  <address@hidden>
+
+       * net/tramp.el (tramp-handle-insert-directory): Handle also
+       symlinks, when FILENAME is not in `default-directory'.
+
 2010-01-28  Michael Albinus  <address@hidden>
 
        * 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

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2010-01-28 21:55:43 +0000
+++ b/lisp/net/tramp.el 2010-01-29 16:23:25 +0000
@@ -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)))
               "."