From ee481d30f902b20f7a7fdf41a81ccf139ec440e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= Date: Thu, 18 Dec 2025 22:41:12 +0000 Subject: [PATCH] Eglot: remove "face" suffix for semtok-specific faces * lisp/progmodes/eglot.el (eglot--semtok-define-things) (eglot--semtok-decode-token): Remove "face" suffix for semtok faces. --- lisp/progmodes/eglot.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 553495c7702..f6a7be6ddf0 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -4677,7 +4677,7 @@ If NOERROR, return predicate, else erroring function." ;;; Semantic tokens (defmacro eglot--semtok-define-things () (cl-flet ((def-it (name def) - `(defface ,(intern (format "eglot-semantic-%s-face" name)) + `(defface ,(intern (format "eglot-semantic-%s" name)) '((t (:inherit ,def))) ,(format "Face for painting a `%s' LSP semantic token" name) :group 'eglot-semantic-fontification))) @@ -4715,10 +4715,10 @@ If NOERROR, return predicate, else erroring function." when (cl-plusp (logand (cdr tok) (ash 1 j))) collect m into names and when (member m eglot-semantic-token-modifiers) - collect (intern (format "eglot-semantic-%s-face" m)) into faces + collect (intern (format "eglot-semantic-%s" m)) into faces finally (when (member tname eglot-semantic-token-types) - (push (intern (format "eglot-semantic-%s-face" tname)) faces)) + (push (intern (format "eglot-semantic-%s" tname)) faces)) (cl-return (cons (cons tname names) faces)))) semtok-cache) probe))))