summaryrefslogtreecommitdiff
path: root/test/lisp
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2021-06-29 17:15:55 +0200
committerMichael Albinus <michael.albinus@gmx.de>2021-06-29 17:15:55 +0200
commitcd339e85a695f40d93b5ce9f4e65075dd979b25b (patch)
treea776ed047341d35020f7a3784ee28498f9c3bcb1 /test/lisp
parent6b4043833cf2e846d41e714e2c72372b60d0d594 (diff)
downloademacs-cd339e85a695f40d93b5ce9f4e65075dd979b25b.tar.gz
emacs-cd339e85a695f40d93b5ce9f4e65075dd979b25b.tar.bz2
emacs-cd339e85a695f40d93b5ce9f4e65075dd979b25b.zip
Sync with Tramp 2.5.1
* doc/misc/trampver.texi: * lisp/net/trampver.el: Change version to "2.5.1". * lisp/tramp.el (tramp-handle-write-region): * lisp/tramp-adb.el (tramp-adb-handle-write-region): * lisp/tramp-sh.el (tramp-sh-handle-write-region): Call local `write-region' directly. * test/lisp/net/tramp-tests.el (tramp--test-utf8): Adapt test for MS Windows.
Diffstat (limited to 'test/lisp')
-rw-r--r--test/lisp/net/tramp-tests.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 37cd7011618..6aa8629f334 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -6280,8 +6280,9 @@ Use the `ls' command."
x ""))
(not (string-empty-p x))
;; ?\n and ?/ shouldn't be part of any file name. ?\t,
- ;; ?. and ?? do not work for "smb" method.
- (replace-regexp-in-string "[\t\n/.?]" "" x)))
+ ;; ?. and ?? do not work for "smb" method. " " does not
+ ;; work at begin or end of the string for MS Windows.
+ (replace-regexp-in-string "[ \t\n/.?]" "" x)))
language-info-alist)))))))
(ert-deftest tramp-test41-utf8 ()