From: Stefan Kangas <stefankangas@gmail.com>
Date: Wed, 29 Mar 2023 04:30:09 +0000 (+0200)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f24aa0f46af1f808aa051fdbb44876a1141c928c;p=emacs.git

Merge from origin/emacs-29

3965c65d5e2 ; * lisp/subr.el (read-char-choice): Fix last change.
c1eac5b6586 Improve documentation of 'read-choice' and related symbols
a8c9283e170 Revert "Comp fix calls to redefined primtives with op-byt...
8b66d8abd01 Revert "* lisp/emacs-lisp/comp.el (comp-emit-set-call-sub...
4ec4f614c71 ; Fix incompatibility in 'display-buffer-assq-regexp'
ba3ade58f3b Skip ruby-ts-imenu-index test if needed
9133446db87 Fix Eglot Tramp tests on EMBA
5b351bc7fa9 * test/infra/Dockerfile.emba (emacs-gnustep): Instrument ...
---

f24aa0f46af1f808aa051fdbb44876a1141c928c
diff --cc test/lisp/progmodes/eglot-tests.el
index 71d9d7270dd,2388cf9ef51..b11ce942b7d
--- a/test/lisp/progmodes/eglot-tests.el
+++ b/test/lisp/progmodes/eglot-tests.el
@@@ -1277,28 -1257,17 +1277,29 @@@ macro will assume it exists.
  
  (defvar tramp-histfile-override)
  (defun eglot--call-with-tramp-test (fn)
 +  (unless (>= emacs-major-version 27)
 +    (ert-skip "Eglot Tramp support only on Emacs >= 27"))
    ;; Set up a Tramp method that’s just a shell so the remote host is
    ;; really just the local host.
 -  (let* ((tramp-remote-path (cons 'tramp-own-remote-path tramp-remote-path))
 +  (let* ((tramp-remote-path (cons 'tramp-own-remote-path
 +                                  tramp-remote-path))
           (tramp-histfile-override t)
+          (tramp-allow-unsafe-temporary-files t)
           (tramp-verbose 1)
 -         (temporary-file-directory ert-remote-temporary-file-directory)
 +         (temporary-file-directory
 +          (or (bound-and-true-p ert-remote-temporary-file-directory)
 +              (prog1 (format "/mock::%s" temporary-file-directory)
 +                (add-to-list
 +                 'tramp-methods
 +                 '("mock"
 +                   (tramp-login-program "sh")       (tramp-login-args (("-i")))
 +                   (tramp-direct-async ("-c"))      (tramp-remote-shell "/bin/sh")
 +                   (tramp-remote-shell-args ("-c")) (tramp-connection-timeout 10)))
 +                (add-to-list 'tramp-default-host-alist
 +                             `("\\`mock\\'" nil ,(system-name)))
 +                (when (and noninteractive (not (file-directory-p "~/")))
 +                  (setenv "HOME" temporary-file-directory)))))
           (default-directory temporary-file-directory))
 -    ;; We must check the remote LSP server.  So far, just "clangd" is used.
 -    (unless (executable-find "clangd" 'remote)
 -      (ert-skip "Remote clangd not found"))
      (funcall fn)))
  
  (ert-deftest eglot-test-tramp-test ()