[Emacs-diffs] trunk r116537: * net/tramp-sh.el (tramp-sh-handle-file-truename): Preserve trailing "/".

[Michael Albinus]

------------------------------------------------------------
revno: 116537
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16851
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sun 2014-02-23 15:51:29 +0100
message:
  * net/tramp-sh.el (tramp-sh-handle-file-truename): Preserve trailing "/".
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-23 08:26:40 +0000
+++ b/lisp/ChangeLog    2014-02-23 14:51:29 +0000
@@ -1,3 +1,8 @@
+2014-02-23  Michael Albinus  <address@hidden>
+
+       * net/tramp-sh.el (tramp-sh-handle-file-truename):
+       Preserve trailing "/".  (Bug#16851)
+
 2014-02-23  Dmitry Gutov  <address@hidden>
 
        * 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):

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2014-02-20 14:24:13 +0000
+++ b/lisp/net/tramp-sh.el      2014-02-23 14:51:29 +0000
@@ -1042,7 +1042,8 @@
                  (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.