diff options
| author | Po Lu | 2022-02-22 18:47:49 +0800 |
|---|---|---|
| committer | Po Lu | 2022-02-22 18:47:49 +0800 |
| commit | 8fef9a5cd9a16b2f91f2ad4e7edbcc49c3963d42 (patch) | |
| tree | d7f624da4a5c638dd4b7ba8a5cc7a22568f2fdbe | |
| parent | f7b5553045e2903852f0a9a90b382d1617ff18a0 (diff) | |
| parent | dfd76688beac1d99a9cdcfe375e0a125cb039b8f (diff) | |
| download | emacs-8fef9a5cd9a16b2f91f2ad4e7edbcc49c3963d42.tar.gz emacs-8fef9a5cd9a16b2f91f2ad4e7edbcc49c3963d42.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 2ce7881543f..4e74f2aa73f 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el | |||
| @@ -6533,8 +6533,8 @@ This requires restrictions of file name syntax." | |||
| 6533 | ;; processes in Emacs. That doesn't work | 6533 | ;; processes in Emacs. That doesn't work |
| 6534 | ;; for tramp-adb.el. tramp-sshfs.el times | 6534 | ;; for tramp-adb.el. tramp-sshfs.el times |
| 6535 | ;; out for older Emacsen, reason unknown. | 6535 | ;; out for older Emacsen, reason unknown. |
| 6536 | (or (not (tramp--test-adb-p)) | 6536 | (or (and (not (tramp--test-adb-p)) |
| 6537 | (not (tramp--test-sshfs-p)) | 6537 | (not (tramp--test-sshfs-p))) |
| 6538 | (tramp--test-emacs27-p))) | 6538 | (tramp--test-emacs27-p))) |
| 6539 | (let ((default-directory file1)) | 6539 | (let ((default-directory file1)) |
| 6540 | (dolist (this-shell-command | 6540 | (dolist (this-shell-command |