From: Stefan Kangas Date: Wed, 20 Jul 2022 08:30:41 +0000 (+0200) Subject: Merge from origin/emacs-28 X-Git-Tag: emacs-29.0.90~1447^2~844 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bbac84ac9b169103c39069ded34dd213b7240f1f;p=emacs.git Merge from origin/emacs-28 cb911febc6 ; Fix typos # Conflicts: # test/lisp/net/tramp-tests.el --- bbac84ac9b169103c39069ded34dd213b7240f1f diff --cc test/lisp/net/tramp-tests.el index 551a70a21ad,cee3651f213..55a6feba9b7 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@@ -6547,8 -6290,8 +6547,8 @@@ This is used in tests which we don't wa (string-match-p "[[:multibyte:]]" default-directory))))) (defun tramp--test-crypt-p () - "Check, whether the remote directory is crypted." + "Check, whether the remote directory is encrypted." - (tramp-crypt-file-name-p tramp-test-temporary-file-directory)) + (tramp-crypt-file-name-p ert-remote-temporary-file-directory)) (defun tramp--test-docker-p () "Check, whether the docker method is used.