From 7a725b2e20155b1686830430e56104c449f4ecec Mon Sep 17 00:00:00 2001
From: Steve Purcell <steve@sanityinc.com>
Date: Thu, 21 Nov 2024 14:09:24 +0000
Subject: [PATCH] Add just-ts-mode

---
 init.el            | 4 ++++
 lisp/init-utils.el | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/init.el b/init.el
index 0b74cc3fc1..6f93d485e1 100644
--- a/init.el
+++ b/init.el
@@ -124,6 +124,10 @@
 (require 'init-nix)
 (maybe-require-package 'nginx-mode)
 (maybe-require-package 'just-mode)
+(when (maybe-require-package 'just-ts-mode)
+  ;; Undo overly-optimistic autoloading, so that things still work in
+  ;; Emacs 29 without treesitter
+  (sanityinc/remove-auto-mode  'just-ts-mode))
 (maybe-require-package 'justl)
 
 (require 'init-paredit)
diff --git a/lisp/init-utils.el b/lisp/init-utils.el
index 6a392cb068..e5cb5cb839 100644
--- a/lisp/init-utils.el
+++ b/lisp/init-utils.el
@@ -38,6 +38,10 @@ BUFFER and ALIST are as for `display-buffer-full-frame'."
   (dolist (pattern patterns)
     (add-to-list 'auto-mode-alist (cons pattern mode))))
 
+(defun sanityinc/remove-auto-mode (mode)
+  "Remove entries from `auto-mode-alist' that are for `MODE'."
+  (setq auto-mode-alist (seq-remove (lambda (x) (eq mode (cdr x))) auto-mode-alist)))
+
 ;; Like diminish, but for major modes
 (defun sanityinc/set-major-mode-name (name)
   "Override the major mode NAME in this buffer."