Merge from origin/emacs-26

8c8b673288 Fix backing up remote files in local directories on MS-Win...
8eb6870be6 Fix vertical cursor motion in pixel-scroll.el
625e84f156 Fix typos in doc strings of message.el
9292276a44 Fix a typo in the Emacs manual
42509c0649 Improve the documentation of 'table-insert-sequence'
93dc7ae4a4 Port better to QNX
ad99550610 Make tramp-test42-auto-load more robust
af0ce33d08 ; * lisp/composite.el (find-composition): Fix a typo in la...
bdbcdbac43 Avoid assertions in find-composition

1 files changed, 2 insertions, 4 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 044ab9329ff..5699ab4b237 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -4624,15 +4624,13 @@ process sentinels.  They shall not disturb each other."
         (ignore-errors (cancel-timer timer))
         (ignore-errors (delete-directory tmp-name 'recursive)))))))
 
+;; This test is inspired by Bug#29163.
 (ert-deftest tramp-test42-auto-load ()
   "Check that Tramp autoloads properly."
-  (skip-unless (tramp--test-enabled))
-  (skip-unless (not (tramp--test-mock-p)))
-
   (let ((default-directory (expand-file-name temporary-file-directory))
         (code
          (format
-          "(message \"Tramp loaded: %%s\" (consp (file-attributes %S)))"
+          "(message \"Tramp loaded: %%s\" (and (file-remote-p %S) t))"
           tramp-test-temporary-file-directory)))
     (should
      (string-match