diff options
| author | Michael Albinus | 2018-07-20 10:56:41 +0200 |
|---|---|---|
| committer | Michael Albinus | 2018-07-20 10:56:41 +0200 |
| commit | 61de292c72382403633f753c3d632a560ccfee98 (patch) | |
| tree | 54a8d8efab8abbf387ed722abadf5cab5faea8d0 /test | |
| parent | 3e722980df9d4a705394c843a2a5e051e9c682b6 (diff) | |
| download | emacs-61de292c72382403633f753c3d632a560ccfee98.tar.gz emacs-61de292c72382403633f753c3d632a560ccfee98.zip | |
Fix (Bug#32218). Do not merge with master
* doc/misc/trampver.texi:
* lisp/net/trampver.el: Change version to "2.3.4.26.2".
(customize-package-emacs-version-alist): Add Tramp version
integrated in Emacs 26.2.
* lisp/net/tramp.el (tramp-handle-file-truename):
* lisp/net/tramp-adb.el (tramp-adb-handle-file-truename):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-truename): Fix problem
with trailing slash. (Bug#32218)
* test/lisp/net/tramp-tests.el (tramp-test21-file-links):
Remove `tramp--test-emacs27-p' check.
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index e70f00eb2cf..8f810818af1 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el | |||
| @@ -2855,10 +2855,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." | |||
| 2855 | ;; We must unquote it. | 2855 | ;; We must unquote it. |
| 2856 | (should | 2856 | (should |
| 2857 | (string-equal | 2857 | (string-equal |
| 2858 | (funcall | 2858 | (file-truename tmp-name1) |
| 2859 | (if (tramp--test-emacs27-p) | ||
| 2860 | 'tramp-compat-file-name-unquote 'identity) | ||
| 2861 | (file-truename tmp-name1)) | ||
| 2862 | (tramp-compat-file-name-unquote (file-truename tmp-name3)))))) | 2859 | (tramp-compat-file-name-unquote (file-truename tmp-name3)))))) |
| 2863 | 2860 | ||
| 2864 | ;; Cleanup. | 2861 | ;; Cleanup. |