From 67dd97a4f76839e4f4c41357f7a2bd27cc9d59bd Mon Sep 17 00:00:00 2001 From: João Távora Date: Sun, 11 Jan 2026 12:43:48 +0000 Subject: Eglot: solve misc Elisp compatibility problems on Emacs 26.3 * lisp/progmodes/eglot.el (eglot--semtok-request) (eglot--semtok-after-send-changes): Unbreak for 26.3. * test/lisp/progmodes/eglot-tests.el (eglot--tests-connect): Use split-string. (eglot-test-rust-completion-exit-function): Use skip-unless. --- lisp/progmodes/eglot.el | 4 ++-- test/lisp/progmodes/eglot-tests.el | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 05075bffc87..587b03ee1ba 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -5018,11 +5018,11 @@ See `eglot--semtok-request' implementation for details.") (defun eglot--semtok-after-send-changes () ;; (trace-values "Dispatching") - (setf (plist-get eglot--semtok-state :dispatched) t)) + (setf (cl-getf eglot--semtok-state :dispatched) t)) (cl-defun eglot--semtok-request (beg end &aux (docver eglot--docver)) "Ask for tokens. Arrange for BEG..END to be font-lock flushed." - (cl-macrolet ((c (tag) `(plist-get eglot--semtok-state ,tag))) + (cl-macrolet ((c (tag) `(cl-getf eglot--semtok-state ,tag))) (cl-labels ((req (method &optional params cont &aux (buf (current-buffer))) diff --git a/test/lisp/progmodes/eglot-tests.el b/test/lisp/progmodes/eglot-tests.el index c2d67dc3530..0924058121f 100644 --- a/test/lisp/progmodes/eglot-tests.el +++ b/test/lisp/progmodes/eglot-tests.el @@ -299,7 +299,7 @@ directory hierarchy." (eglot-sync-connect t) (eglot-connect-timeout timeout) (eglot-server-programs - (if server `((,major-mode . ,(string-split server))) + (if server `((,major-mode . ,(split-string server))) eglot-server-programs))) (apply #'eglot--connect (eglot--guess-contact)))) @@ -775,7 +775,7 @@ directory hierarchy." ;; This originally appeared in github#1339 (skip-unless (executable-find "rust-analyzer")) (skip-unless (executable-find "cargo")) - (skip-when (getenv "EMACS_EMBA_CI")) + (skip-unless (not (getenv "EMACS_EMBA_CI"))) (eglot--with-fixture '(("cmpl-project" . (("main.rs" . -- cgit v1.2.1