From 1ea2b58fe67c576a3d7b1e10abf4fb39bb35dc10 Mon Sep 17 00:00:00 2001 From: Zero King Date: Mon, 24 Jun 2024 23:22:31 +0800 Subject: [PATCH 1/4] bump: :lang clojure babashka/neil@a1db63d420b8 -> babashka/neil@a38be9f0821b borkdude/flycheck-clj-kondo@9089ade9e01b -> borkdude/flycheck-clj-kondo@e38c67ba9db1 clojure-emacs/cider@aa26d62ac599 -> clojure-emacs/cider@105da319b09a clojure-emacs/clj-refactor.el@fa3efe18e715 -> clojure-emacs/clj-refactor.el@dc1bbc8cdaa7 clojure-emacs/clojure-mode@222fdafa2add -> clojure-emacs/clojure-mode@59888c84b610 --- modules/lang/clojure/packages.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/lang/clojure/packages.el b/modules/lang/clojure/packages.el index 0712af7ef..da95475b3 100644 --- a/modules/lang/clojure/packages.el +++ b/modules/lang/clojure/packages.el @@ -14,13 +14,13 @@ (package! parseedn :pin "3407e4530a367b6c2b857dae261cdbb67a440aaa") ;;; Core packages -(package! clojure-mode :pin "222fdafa2add56a171ded245339a383e5e3078ec") -(package! clj-refactor :pin "fa3efe18e7150df5153a7d05c54e96d59398a0a8") -(package! cider :pin "aa26d62ac59930079e47e652ccd73e8e447defd5") +(package! clojure-mode :pin "59888c84b61081e9b0085e388f55132925a66e7a") +(package! clj-refactor :pin "dc1bbc8cdaa723bdbb6669ea7d280625c370755d") +(package! cider :pin "105da319b09a436552f1b3c6194cbbc833017dd2") (when (and (modulep! :checkers syntax) (not (modulep! :checkers syntax +flymake))) - (package! flycheck-clj-kondo :pin "9089ade9e01b091139321c78ad75946944ff845d")) + (package! flycheck-clj-kondo :pin "e38c67ba9db1ea1cbe1b61ab39b506c05efdcdbf")) (package! jet :pin "7d5157aac692fc761d8ed7a9f820fa6522136254") (package! neil :recipe (:host github :repo "babashka/neil" :files ("*.el")) - :pin "a1db63d420b85db814207113ca4a0b4b959073cc") + :pin "a38be9f0821b828f7c75a527bc4cfb256f6aa8af") From 7ce9a995833d0bd95543c279c6972aac5c129260 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 25 Jun 2024 02:44:14 -0400 Subject: [PATCH 2/4] fix(fold): only enable ts-fold-mode in tree-sitter buffers ts-fold-mode is buffer-local, and will complain if activated in a buffer tree-sitter doesn't support (e.g. fundamental-mode). global-ts-fold-mode will filter based on tree-sitter-mode's activation and language support. Fix: #7895 --- modules/editor/fold/config.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/editor/fold/config.el b/modules/editor/fold/config.el index e1f7dc21c..fc9b196e0 100644 --- a/modules/editor/fold/config.el +++ b/modules/editor/fold/config.el @@ -86,6 +86,7 @@ :config (vimish-fold-global-mode +1)) + (use-package! ts-fold :when (modulep! :tools tree-sitter) :after tree-sitter @@ -97,4 +98,4 @@ :inherit font-lock-comment-face :weight light)) (setq ts-fold-replacement " [...] ") - (ts-fold-mode +1)) + (global-ts-fold-mode +1)) From 1427179d98610168df54c4b31891421bd5faeb6c Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 25 Jun 2024 19:32:16 -0400 Subject: [PATCH 3/4] feat(sh): assoc zsh compdef files with sh-mode --- modules/lang/sh/config.el | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/lang/sh/config.el b/modules/lang/sh/config.el index 8967e60e6..7355b7ac3 100755 --- a/modules/lang/sh/config.el +++ b/modules/lang/sh/config.el @@ -14,6 +14,7 @@ :mode ("\\.bats\\'" . sh-mode) :mode ("\\.\\(?:zunit\\|env\\)\\'" . sh-mode) :mode ("/bspwmrc\\'" . sh-mode) + :magic ("#compdef " . sh-mode) :config (set-docsets! 'sh-mode "Bash") (set-electric! 'sh-mode :words '("else" "elif" "fi" "done" "then" "do" "esac" ";;")) From cc7a509e10785dba94f899a0d428d01e6b8bb078 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 25 Jun 2024 19:33:15 -0400 Subject: [PATCH 4/4] bump: :editor fold emacs-tree-sitter/ts-fold@6ce584d1ac39 -> emacs-tree-sitter/ts-fold@5b8abb69cdef --- modules/editor/fold/packages.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/editor/fold/packages.el b/modules/editor/fold/packages.el index 5f33a2335..5b34ca021 100644 --- a/modules/editor/fold/packages.el +++ b/modules/editor/fold/packages.el @@ -7,5 +7,5 @@ (when (modulep! :editor evil) (package! evil-vimish-fold :pin "b6e0e6b91b8cd047e80debef1a536d9d49eef31a")) (when (modulep! :tools tree-sitter) - (package! ts-fold :pin "6ce584d1ac39f1e2bc2f66f815964e3047bd6f16" + (package! ts-fold :pin "5b8abb69cdef3128f1fdb69176b9963b13ceaf02" :recipe (:host github :repo "emacs-tree-sitter/ts-fold")))