From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 3 Dec 2017 05:38:05 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~6102
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f1204e1dda84a65d7906949247076c6ba4d4ba40;p=emacs.git

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
---

f1204e1dda84a65d7906949247076c6ba4d4ba40
diff --cc test/lisp/net/tramp-tests.el
index 044ab9329ff,b0fe3f83e97..5699ab4b237
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@@ -4622,13 -4611,11 +4622,11 @@@ process sentinels.  They shall not dist
            (ignore-errors (delete-process (get-buffer-process buf)))
            (ignore-errors (kill-buffer buf)))
          (ignore-errors (cancel-timer timer))
 -        (ignore-errors (delete-directory tmp-name 'recursive))))))
 +        (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