From 1e911c7a853ac5381cb1f935b26437ac370ab97e Mon Sep 17 00:00:00 2001 From: Ruslan Kamashev Date: Sun, 28 Sep 2025 19:22:23 +0400 Subject: [PATCH] Fix evil-shift-width for yaml-ts-mode --- evil-collection.el | 2 +- modes/yaml-mode/evil-collection-yaml-mode.el | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/evil-collection.el b/evil-collection.el index 8f3b7bd2..a27631de 100644 --- a/evil-collection.el +++ b/evil-collection.el @@ -350,7 +350,7 @@ See `evil-collection-init' and `evil-collection--modes-with-delayed-setup'." woman xref xwidget - yaml-mode + (yaml-mode ,@(when (>= emacs-major-version 29) '(yaml-ts-mode))) youtube-dl zmusic (ztree ztree-diff ztree-dir)) diff --git a/modes/yaml-mode/evil-collection-yaml-mode.el b/modes/yaml-mode/evil-collection-yaml-mode.el index 3bf66672..0ef9d1c5 100644 --- a/modes/yaml-mode/evil-collection-yaml-mode.el +++ b/modes/yaml-mode/evil-collection-yaml-mode.el @@ -25,6 +25,7 @@ ;;; Code: (require 'evil-collection) (require 'yaml-mode nil t) +(require 'yaml-ts-mode nil t) (defconst evil-collection-yaml-mode-maps nil) @@ -36,7 +37,8 @@ ;;;###autoload (defun evil-collection-yaml-mode-setup () "Set up `evil' bindings for `yaml'." - (add-hook 'yaml-mode-hook #'evil-collection-yaml-mode-set-evil-shift-width)) + (dolist (hook '(yaml-mode-hook yaml-ts-mode-hook)) + (add-hook hook #'evil-collection-yaml-mode-set-evil-shift-width))) (provide 'evil-collection-yaml-mode) ;;; evil-collection-yaml-mode.el ends here