Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

2 files changed, 27 insertions, 21 deletions

diff --git a/test/lisp/electric-tests.el b/test/lisp/electric-tests.el
index 9dd27661d46..c4ccec7a0d8 100644
--- a/test/lisp/electric-tests.el
+++ b/test/lisp/electric-tests.el
@@ -706,8 +706,7 @@ baz\"\""
   :test-in-comments nil :test-in-strings nil)
 
 (define-electric-pair-test electric-quote-markdown-in-code
-  #("`a`" 1 2 (face font-lock-constant-face)) "-'"
-  :expected-string "`'a`" :expected-point 3
+  "`a`" "-'" :expected-string "`'a`" :expected-point 3
   :modes '(text-mode)
   :fixture-fn (lambda ()
                 (electric-quote-local-mode)
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 31cf7f9ba1c..6c02daa6547 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -3739,6 +3739,8 @@ process sentinels.  They shall not disturb each other."
 
             ;; Open asynchronous processes.  Set process filter and sentinel.
             (dolist (buf buffers)
+              ;; Activate timer.
+              (sit-for 0.01 'nodisp)
               (let ((proc
                      (start-file-process-shell-command
                       (buffer-name buf) buf
@@ -3768,6 +3770,8 @@ process sentinels.  They shall not disturb each other."
             ;; with regular operation.
             (let ((buffers (copy-sequence buffers)))
               (while buffers
+                ;; Activate timer.
+                (sit-for 0.01 'nodisp)
                 (let* ((buf (nth (random (length buffers)) buffers))
                        (proc (get-buffer-process buf))
                        (file (process-get proc 'foo))
@@ -3808,31 +3812,34 @@ process sentinels.  They shall not disturb each other."
   "Check that Tramp does not fail due to recursive load."
   (skip-unless (tramp--test-enabled))
 
-  (dolist (code
-           (list
-            (format "(expand-file-name %S)" tramp-test-temporary-file-directory)
-            (format
-             "(let ((default-directory %S)) (expand-file-name %S))"
-             tramp-test-temporary-file-directory
-             temporary-file-directory)))
-    (should-not
-     (string-match
-      "Recursive load"
-      (shell-command-to-string
-       (format
-        "%s -batch -Q -L %s --eval %s"
-        (expand-file-name invocation-name invocation-directory)
-        (mapconcat 'shell-quote-argument load-path " -L ")
-        (shell-quote-argument code)))))))
+  (let ((default-directory (expand-file-name temporary-file-directory)))
+    (dolist (code
+             (list
+              (format
+               "(expand-file-name %S)" tramp-test-temporary-file-directory)
+              (format
+               "(let ((default-directory %S)) (expand-file-name %S))"
+               tramp-test-temporary-file-directory
+               temporary-file-directory)))
+      (should-not
+       (string-match
+        "Recursive load"
+        (shell-command-to-string
+         (format
+          "%s -batch -Q -L %s --eval %s"
+          (expand-file-name invocation-name invocation-directory)
+          (mapconcat 'shell-quote-argument load-path " -L ")
+          (shell-quote-argument code))))))))
 
 (ert-deftest tramp-test38-remote-load-path ()
   "Check that Tramp autoloads its packages with remote `load-path'."
   ;; `tramp-cleanup-all-connections' is autoloaded from tramp-cmds.el.
   ;; It shall still work, when a remote file name is in the
   ;; `load-path'.
-  (let ((code
-         "(let ((force-load-messages t)\
-                (load-path (cons \"/foo:bar:\" load-path)))\
+  (let ((default-directory (expand-file-name temporary-file-directory))
+        (code
+         "(let ((force-load-messages t) \
+                (load-path (cons \"/foo:bar:\" load-path))) \
             (tramp-cleanup-all-connections))"))
     (should
      (string-match