Merge from origin/emacs-31

cf96e9cb5a5 ; Fix byte-compilation warnings in non-Tree-Sitter builds
23575adc7be ; * doc/lispref/variables.texi (Local Variables): Fix typ...
8b6fb2f6465 ; * doc/lispref/variables.texi (Local Variables): Fix 'na...
d3c72b83890 ; * src/xdisp.c (display_line): Fix commentary (bug#80693).
a981517b72e Fill margins with 'margin' face on truncated screen lines
8e374990357 ; * doc/lispref/os.texi (Init File): Fix markup (bug#81049).
f4c326c378a ; * src/sfnt.c (sfnt_read_cmap_format_12): Assert there's...
bf89ee6d078 ; * etc/PROBLEMS: Cursor not shown on Windows with system...
20500d62006 ; htmlfontify: Handle 'reset' face attribute value (bug#8...
d0d657fa902 ; Minor Tramp cleanup
93ea0d7d289 ; Improve documentation of VC commands in Dired
318084829c5 Eglot: adjust reference to completion frontends in manual
2a166c2dbdb Eldoc: display documentation in visual-line-mode
aba60ad0c5b Eglot: prefer markdown-ts-view-mode for markup rendering ...
689c3bd5088 Use 'read-multiple-choice' in 'markdown-ts-mode' (bug#81027)
71809ee5df5 Fix 'markdown-ts-code-span' face (bug#81026)
286833e401d Add read-only 'markdown-ts-view-mode' (bug#81023)
b39c123490b Fix strikethrough in 'markdown-ts-mode' (bug#80991)
0be998d4bc0 Fix code-span in headings in 'markdown-ts-mode' (bug#80979)
a00beb3a31b Make 'markdown-ts-inline-images' buffer local and test fo...
a0c05029fd1 * etc/NEWS: Mention new user option tramp-propagate-emacs...
2e71d2c709f Propagate EMACSCLIENT_TRAMP to remote hosts with Tramp
ff96db93f23 keyboard-tests.el: Try and fix the failure on EMBA
ce3098752cf doc: Remove long obsolete references to `package-initialize`
9bc04b001ac vc-next-action: Call vc-delete-file on FILESET-ONLY-FILES
13039e3442b ; touch-up last commit: copyright and comments
c2a24dcec8b ; update msys2 build helper for Emacs 31 & UCRT
3630baae720 hideshow: Support new 'margin' face for margin indicators...
20d17df3f4f Use the new 'margin' face in Flymake (bug#80693)
07f2bbc905d vc-dir-resynch-file: Pass down non-truename'd FILE

2 files changed, 26 insertions, 7 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index c76d6d54c3d..c0ad7205c5d 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -6524,8 +6524,7 @@ INPUT, if non-nil, is a string sent to the process."
   "Check that remote processes set / unset environment variables properly."
   :tags '(:expensive-test)
   (skip-unless (tramp--test-enabled))
-  (skip-unless (tramp--test-sh-p))
-  (skip-unless (not (tramp--test-crypt-p)))
+  (skip-unless (tramp--test-supports-environment-variables-p))
 
   (dolist (this-shell-command-to-string
 	   (append
@@ -6555,6 +6554,21 @@ INPUT, if non-nil, is a string sent to the process."
 	  (funcall
 	   this-shell-command-to-string "echo \"${INSIDE_EMACS:-bla}\""))))
 
+      ;; Check EMACSCLIENT_TRAMP.
+      (setenv "EMACSCLIENT_TRAMP")
+      (let ((tramp-propagate-emacsclient-tramp t))
+	(should
+	 (string-equal
+	  (format "%s\n" (tramp-make-tramp-file-name tramp-test-vec 'noloc))
+	  (funcall
+	   this-shell-command-to-string "echo \"${EMACSCLIENT_TRAMP:-bla}\""))))
+      (let (tramp-propagate-emacsclient-tramp)
+	(should
+	 (string-equal
+	  "bla\n"
+	  (funcall
+	   this-shell-command-to-string "echo \"${EMACSCLIENT_TRAMP:-bla}\""))))
+
       ;; Set a value.
       (let ((process-environment
 	     (cons (concat envvar "=foo") process-environment)))
@@ -7782,6 +7796,11 @@ This requires restrictions of file name syntax."
       (tramp--test-sh-p) (tramp--test-smb-p)
       (tramp--test-sudoedit-p)))
 
+(defun tramp--test-supports-environment-variables-p ()
+  "Return whether setting environment variables is supported."
+  (and (tramp--test-sh-p)
+       (not (tramp--test-crypt-p))))
+
 (defun tramp--test-check-files (&rest files)
   "Run a simple but comprehensive test over every file in FILES."
   (dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
diff --git a/test/src/keyboard-tests.el b/test/src/keyboard-tests.el
index e4a1bf36a63..b64b20fb6cb 100644
--- a/test/src/keyboard-tests.el
+++ b/test/src/keyboard-tests.el
@@ -92,11 +92,11 @@
              `(,(expand-file-name invocation-name invocation-directory)
                "-Q" "--batch" "--eval"
                ,(prin1-to-string
-                 `(progn (setq kill-emacs-on-sigint nil)
-                         (message "Ready!")
-                         (condition-case nil
-                             (dotimes (_ 3) (sit-for 1))
-                           (quit (message "%s" ,exit-msg)))))))))
+                 `(condition-case nil
+                      (progn (setq kill-emacs-on-sigint nil)
+                             (message "Ready!")
+                             (sleep-for 3))
+                    (quit (message "%s" ,exit-msg))))))))
       (while (progn (accept-process-output proc 1.0)
                     (goto-char (point-min))
                     (not (re-search-forward "Ready!" nil t)))