* net/tramp-sh.el (tramp-sh-handle-file-truename): Preserve trailing "/".

Fixes: debbugs:16851

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 40f5d7defc12ecf0c2f8da9ea76e9fabf47dc2f6..de5dd56ddbbd61abf2a86ab61ae694d68ad2097c 100644 (file)
--- 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 01abfe0e71f44ac722166c145a855c1bd19c5907..efad151dac88d079e2d36492ec2e07b164812f7a 100644 (file)
--- 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.