diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2014-02-23 15:51:29 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2014-02-23 15:51:29 +0100 |
| commit | 85c01f803fb003f33a30da2ebf157e69cd30c2cf (patch) | |
| tree | f28f5392e66c0da67c7bf0e41d95026035b8a6d6 | |
| parent | 0b5d5a442a3e4d1da2a93fc094c98fece5c24ed6 (diff) | |
| download | emacs-85c01f803fb003f33a30da2ebf157e69cd30c2cf.tar.gz | |
* net/tramp-sh.el (tramp-sh-handle-file-truename): Preserve trailing "/".
Fixes: debbugs:16851
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 40f5d7defc1..de5dd56ddbb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-02-23 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp-sh.el (tramp-sh-handle-file-truename): + Preserve trailing "/". (Bug#16851) + 2014-02-23 Dmitry Gutov <dgutov@yandex.ru> * progmodes/ruby-mode.el (ruby-smie-rules): Don't indent specially @@ -130,7 +135,7 @@ (tramp-handle-insert-directory): New defun, taken from tramp-gvfs.el. * net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist) - <insert-directory>: Use `tramp-handle-insert-directory. + <insert-directory>: Use `tramp-handle-insert-directory'. (tramp-gvfs-handle-insert-directory): Remove function. * net/tramp-sh.el (tramp-sh-handle-insert-directory): diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 01abfe0e71f..efad151dac8 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1042,7 +1042,8 @@ target of the symlink differ." (setq result (concat result "/")))))) (tramp-message v 4 "True name of `%s' is `%s'" localname result) - result))))) + (if (string-equal (file-name-nondirectory localname) "") + (file-name-as-directory result) result)))))) ;; Basic functions. |