Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
c848881f
Commit
c848881f
authored
Feb 24, 2014
by
Michael Albinus
Browse files
* net/tramp-sh.el (tramp-sh-handle-file-truename): Improve last fix.
parent
0e38ae05
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/net/tramp-sh.el
lisp/net/tramp-sh.el
+9
-4
No files found.
lisp/ChangeLog
View file @
c848881f
2014-02-24 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-sh-handle-file-truename): Improve last fix.
2014-02-24 Nicolas Richard <theonewiththeevillook@yahoo.fr>
* minibuffer.el (completion--try-word-completion):
...
...
lisp/net/tramp-sh.el
View file @
c848881f
...
...
@@ -938,8 +938,11 @@ target of the symlink differ."
(
defun
tramp-sh-handle-file-truename
(
filename
)
"Like `file-truename' for Tramp files."
(
with-parsed-tramp-file-name
(
expand-file-name
filename
)
nil
(
tramp-make-tramp-file-name
method
user
host
(
format
"%s%s"
(
with-parsed-tramp-file-name
(
expand-file-name
filename
)
nil
(
tramp-make-tramp-file-name
method
user
host
(
with-tramp-file-property
v
localname
"file-truename"
(
let
((
result
nil
))
; result steps in reverse order
(
tramp-message
v
4
"Finding true name for `%s'"
filename
)
...
...
@@ -1042,8 +1045,10 @@ target of the symlink differ."
(
setq
result
(
concat
result
"/"
))))))
(
tramp-message
v
4
"True name of `%s' is `%s'"
localname
result
)
(
if
(
string-equal
(
file-name-nondirectory
localname
)
""
)
(
file-name-as-directory
result
)
result
))))))
result
))))
;; Preserve trailing "/".
(
if
(
string-equal
(
file-name-nondirectory
filename
)
""
)
"/"
""
)))
;; Basic functions.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment