aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorMichael Albinus2014-02-23 15:51:29 +0100
committerMichael Albinus2014-02-23 15:51:29 +0100
commit85c01f803fb003f33a30da2ebf157e69cd30c2cf (patch)
treef28f5392e66c0da67c7bf0e41d95026035b8a6d6 /lisp/net
parent0b5d5a442a3e4d1da2a93fc094c98fece5c24ed6 (diff)
downloademacs-85c01f803fb003f33a30da2ebf157e69cd30c2cf.tar.gz
emacs-85c01f803fb003f33a30da2ebf157e69cd30c2cf.zip
* net/tramp-sh.el (tramp-sh-handle-file-truename): Preserve trailing "/".
Fixes: debbugs:16851
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/tramp-sh.el3
1 files changed, 2 insertions, 1 deletions
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."
1042 (setq result (concat result "/")))))) 1042 (setq result (concat result "/"))))))
1043 1043
1044 (tramp-message v 4 "True name of `%s' is `%s'" localname result) 1044 (tramp-message v 4 "True name of `%s' is `%s'" localname result)
1045 result))))) 1045 (if (string-equal (file-name-nondirectory localname) "")
1046 (file-name-as-directory result) result))))))
1046 1047
1047;; Basic functions. 1048;; Basic functions.
1048 1049