diff options
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/net/tramp.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a41e298ecbc..e03e05c46f8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-07 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-check-cached-permissions): Include hop in + the constructed Tramp file name. (Bug#18943) + 2014-11-07 Stefan Monnier <monnier@iro.umontreal.ca> * emulation/cua-base.el (cua--select-keymaps): Use region-active-p diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 969172be70a..5889743e28b 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3919,7 +3919,8 @@ be granted." (tramp-file-name-method vec) (tramp-file-name-user vec) (tramp-file-name-host vec) - (tramp-file-name-localname vec)) + (tramp-file-name-localname vec) + (tramp-file-name-hop vec)) (intern suffix)))) (remote-uid (tramp-get-connection-property |