From 5965c4b12a7b0d613e44de9898b43b8db4383a99 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 3 Dec 2025 17:15:49 -0500 Subject: [PATCH 1/3] fix(cli): EMACS_PLUS_NO_PATH_INJECTION=1 emacs-plus contaminates the shell environment and interferes with Doom's envfile generator. --- bin/doom | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/doom b/bin/doom index 07122f011..b8329f672 100755 --- a/bin/doom +++ b/bin/doom @@ -4,6 +4,7 @@ :; [ "x$EMACS" = xemacs ] && { type emacs >/dev/null 2>&1 || err=1; } :; [ "x$err" = x ] || { echo "Error: failed to run Emacs with command '$EMACS'"; echo; echo "Are you sure Emacs is installed and in your \$PATH?"; exit 1; } >&2 :; emacs="$EMACS ${DEBUG:+--debug-init} -q --no-site-file --batch" +:; export EMACS_PLUS_NO_PATH_INJECTION=1 :; export __DOOMPID="${__DOOMPID:-$$}" :; export __DOOMSTEP="${__DOOMSTEP:-0}" :; export __DOOMGEOM="${__DOOMGEOM:-`tput cols 2>/dev/null`x`tput lines 2>/dev/null`}" From deaf794ccfe3b469909d0a2b33ad514d273b8e53 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 4 Dec 2025 04:32:59 -0500 Subject: [PATCH 2/3] fix(tree-sitter): pre-30 compatibility 0d2f10d introduced a regression that broke the arity check in `set-tree-sitter!` for pre-30 compatibility, because `func-arity` returned the arity of the advice, not the advised function, so the `commit` argument was always stored in `treesit-language-source-alist`, even before it was supported, resulting in wrong-number-of-args errors for users on Emacs <=29. Amend: 0d2f10dcabb5 --- modules/tools/tree-sitter/autoload/tree-sitter.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/tools/tree-sitter/autoload/tree-sitter.el b/modules/tools/tree-sitter/autoload/tree-sitter.el index 0d7ee88bd..5c747397e 100644 --- a/modules/tools/tree-sitter/autoload/tree-sitter.el +++ b/modules/tools/tree-sitter/autoload/tree-sitter.el @@ -43,7 +43,9 @@ pre-Emacs 31." ;; COMPAT: 31.1 introduced a COMMIT recipe argument. On ;; <=30.x, extra arguments will trigger an arity error ;; when installing grammars. - (if (eq (cdr (func-arity 'treesit--install-language-grammar-1)) + (if (eq (cdr (func-arity + (advice--cd*r + (advice--symbol-function 'treesit--install-language-grammar-1)))) 'many) (list commit)))))))))) From a4a61976dcc7247b59506cada0351f846519d08e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 4 Dec 2025 04:41:09 -0500 Subject: [PATCH 3/3] bump: :lang idris latex markdown ardumont/markdown-toc@e3429d301465 -> ardumont/markdown-toc@d3324cb6bc10 emacs-straight/auctex@a2809e4d7068 -> emacs-straight/auctex@a6f4741c2247 idris-hackers/idris-mode@da5c22f43622 -> idris-hackers/idris-mode@85928dc4cc2c jrblevin/markdown-mode@d51c469133d2 -> jrblevin/markdown-mode@92802fae9ebb seagle0128/grip-mode@11fecd5b38c7 -> seagle0128/grip-mode@26bdadf604b3 --- modules/lang/idris/packages.el | 2 +- modules/lang/latex/packages.el | 2 +- modules/lang/markdown/packages.el | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/lang/idris/packages.el b/modules/lang/idris/packages.el index b2435a3d9..937028e14 100644 --- a/modules/lang/idris/packages.el +++ b/modules/lang/idris/packages.el @@ -1,4 +1,4 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/idris/packages.el -(package! idris-mode :pin "da5c22f43622112de9e54d8ef9d3ee324d6973f9") +(package! idris-mode :pin "85928dc4cc2c22010fa91661abd55e6bd3dbacee") diff --git a/modules/lang/latex/packages.el b/modules/lang/latex/packages.el index 67f561c37..02b2f55d2 100644 --- a/modules/lang/latex/packages.el +++ b/modules/lang/latex/packages.el @@ -4,7 +4,7 @@ (package! auctex :recipe (:files ("*.el" "*.info" "dir" "doc" "etc" "images" "latex" "style")) - :pin "a2809e4d7068aaa7fa9cbd51214606393d4ab9eb") + :pin "a6f4741c2247a0bebc074b52c2bea57b50df47d7") (package! adaptive-wrap :pin "d75665b9c88e65f91dadd1e5880905bbdb7c09b7") (package! auctex-cont-latexmk :pin "88c5f04d841c212d2b8331153e9e5c2767cb7197") (when (modulep! :editor evil +everywhere) diff --git a/modules/lang/markdown/packages.el b/modules/lang/markdown/packages.el index 7a6871459..353a2d829 100644 --- a/modules/lang/markdown/packages.el +++ b/modules/lang/markdown/packages.el @@ -1,8 +1,8 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/markdown/packages.el -(package! markdown-mode :pin "d51c469133d220823cc6ab50ff8e8743ed6e42fb") -(package! markdown-toc :pin "e3429d3014655b7d2ff6d5ac12b27d4d94fdcee4") +(package! markdown-mode :pin "92802fae9ebbc8c2e4c281c06dcdbd74b8bca80e") +(package! markdown-toc :pin "d3324cb6bc1001b1c820f04cc0e45e99ee16a0c8") ;; Required by `markdown-mode', or it will install it via package.el if it isn't ;; present when you call `markdown-edit-code-block'. @@ -14,7 +14,7 @@ :pin "2f1ee8b94cdf53cebc31ae08ecfbba846193d5e1")) (when (modulep! +grip) - (package! grip-mode :pin "11fecd5b38c78597ff53a39fb3a090e7c80350fa")) + (package! grip-mode :pin "26bdadf604b34e5a6b9628f3476bf7f5e88d2c3d")) (when (modulep! :editor evil +everywhere) (package! evil-markdown