From d9fd5cb8f30cb2f7f1f9238b993361fa8717ee5f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 31 Aug 2025 14:34:45 +0200 Subject: [PATCH] fix(tree-sitter): treesit-enabled-modes: sort arity in <30 `sort`s signature changed in Emacs 30 from: (sort SEQ PREDICATE) To (sort SEQ &key KEY LESSP REVERSE IN-PLACE) Amend: 6009c2b8382b --- modules/tools/tree-sitter/autoload/compat-30.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/tools/tree-sitter/autoload/compat-30.el b/modules/tools/tree-sitter/autoload/compat-30.el index d37f936b6..2d610aaed 100644 --- a/modules/tools/tree-sitter/autoload/compat-30.el +++ b/modules/tools/tree-sitter/autoload/compat-30.el @@ -55,8 +55,11 @@ or t to enable all ts-modes." (const :tag "Enable all available ts-modes" t) (set :tag "List of enabled ts-modes" ,@(when (treesit-available-p) - (sort (mapcar (lambda (m) `(function-item ,m)) - (seq-uniq (mapcar #'cdr treesit-major-mode-remap-alist))))))) + (let ((items (mapcar (lambda (m) `(function-item ,m)) + (seq-uniq (mapcar #'cdr treesit-major-mode-remap-alist))))) + (if (= (car (func-arity 'sort)) 1) + (sort items) + (sort items #'value<)))))) :initialize #'custom-initialize-default :set (lambda (sym val) (set-default sym val)