diff options
| -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 @@ | |||
| 1 | 2014-11-07 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp.el (tramp-check-cached-permissions): Include hop in | ||
| 4 | the constructed Tramp file name. (Bug#18943) | ||
| 5 | |||
| 1 | 2014-11-07 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-11-07 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * emulation/cua-base.el (cua--select-keymaps): Use region-active-p | 8 | * 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." | |||
| 3919 | (tramp-file-name-method vec) | 3919 | (tramp-file-name-method vec) |
| 3920 | (tramp-file-name-user vec) | 3920 | (tramp-file-name-user vec) |
| 3921 | (tramp-file-name-host vec) | 3921 | (tramp-file-name-host vec) |
| 3922 | (tramp-file-name-localname vec)) | 3922 | (tramp-file-name-localname vec) |
| 3923 | (tramp-file-name-hop vec)) | ||
| 3923 | (intern suffix)))) | 3924 | (intern suffix)))) |
| 3924 | (remote-uid | 3925 | (remote-uid |
| 3925 | (tramp-get-connection-property | 3926 | (tramp-get-connection-property |