diff options
| author | Michael Albinus | 2017-10-26 16:24:28 +0200 |
|---|---|---|
| committer | Michael Albinus | 2017-10-26 16:24:28 +0200 |
| commit | 646e56e150ca08978d6ce736b12867b4958a0cd8 (patch) | |
| tree | 8b4efabdad7c2dc939b1f6d835c42f1cf60fbf20 /lisp | |
| parent | 685fd779592db0019b8489a06d72ec4bebef3c9a (diff) | |
| download | emacs-646e56e150ca08978d6ce736b12867b4958a0cd8.tar.gz emacs-646e56e150ca08978d6ce736b12867b4958a0cd8.zip | |
Fix Bug#28959
* lisp/net/tramp.el (tramp-handle-find-backup-file-name):
Use `tramp-tramp-file-p' rather than `tramp-file-name-p'. Add
hop to backup file name. (Bug#28959)
* test/lisp/net/tramp-tests.el (tramp-test34-find-backup-file-name):
New test.
(tramp-test35-make-nearby-temp-file)
(tramp-test36-special-characters)
(tramp-test36-special-characters-with-stat)
(tramp-test36-special-characters-with-perl)
(tramp-test36-special-characters-with-ls, tramp-test37-utf8)
(tramp-test37-utf8-with-stat, tramp-test37-utf8-with-perl)
(tramp-test37-utf8-with-ls, tramp-test38-file-system-info)
(tramp-test39-asynchronous-requests)
(tramp-test40-recursive-load, tramp-test41-remote-load-path)
(tramp-test42-delay-load, tramp-test43-unload): Rename.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/tramp.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 736c28c4aa8..e300b3a58ed 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el | |||
| @@ -3226,9 +3226,9 @@ User is always nil." | |||
| 3226 | (car x) | 3226 | (car x) |
| 3227 | (if (and (stringp (cdr x)) | 3227 | (if (and (stringp (cdr x)) |
| 3228 | (file-name-absolute-p (cdr x)) | 3228 | (file-name-absolute-p (cdr x)) |
| 3229 | (not (tramp-file-name-p (cdr x)))) | 3229 | (not (tramp-tramp-file-p (cdr x)))) |
| 3230 | (tramp-make-tramp-file-name | 3230 | (tramp-make-tramp-file-name |
| 3231 | method user domain host port (cdr x)) | 3231 | method user domain host port (cdr x) hop) |
| 3232 | (cdr x)))) | 3232 | (cdr x)))) |
| 3233 | tramp-backup-directory-alist) | 3233 | tramp-backup-directory-alist) |
| 3234 | backup-directory-alist))) | 3234 | backup-directory-alist))) |