From 298587d35d70743aca7ef7b8d5230a86469d1320 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Thu, 10 Sep 2020 20:22:42 +0100
Subject: [PATCH] fix(lang): resolve json-snatcher issue by overriding it with
 a fork

---
 core/siren-core-init.el              |  1 +
 core/siren-core-package-overrides.el | 22 ++++++++++++++++++++++
 modules/languages/siren-json.el      |  6 ------
 straight/versions/default.el         |  2 +-
 4 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 core/siren-core-package-overrides.el

diff --git a/core/siren-core-init.el b/core/siren-core-init.el
index fc71455..8d6f6b4 100644
--- a/core/siren-core-init.el
+++ b/core/siren-core-init.el
@@ -42,6 +42,7 @@
 
 ;; Continue core stuff
 (require 'siren-core-packages)
+(require 'siren-core-package-overrides)
 (require 'siren-core-performance)
 (require 'siren-core-env)
 (require 'siren-core-ui)
diff --git a/core/siren-core-package-overrides.el b/core/siren-core-package-overrides.el
new file mode 100644
index 0000000..6ece168
--- /dev/null
+++ b/core/siren-core-package-overrides.el
@@ -0,0 +1,22 @@
+;;; siren-core-package-overrides.el --- jimeh's Emacs Siren: Package overrides
+
+;;; Commentary:
+
+;; List of custom package recipe overrides.
+
+;;; Code:
+
+(setq straight-recipe-overrides
+      '((nil . (
+                ;; Use custom fork of json-snatcher which fixes auto-loading
+                ;; issue with its kill-buffer-hook. More details:
+                ;; https://github.com/Sterlingg/json-snatcher/pull/12
+                (json-snatcher :type git :host github
+                               :repo "Sterlingg/json-snatcher"
+                               :branch "master"
+                               :fork (:host github
+                                            :repo "jimeh/json-snatcher"
+                                            :branch "fix-kill-buffer-hook"))))))
+
+(provide 'siren-core-package-overrides)
+;;; siren-core-packages.el ends here
diff --git a/modules/languages/siren-json.el b/modules/languages/siren-json.el
index 03fd71f..96e8423 100644
--- a/modules/languages/siren-json.el
+++ b/modules/languages/siren-json.el
@@ -31,11 +31,5 @@
 
     (setq flycheck-checker 'json-jsonlint)))
 
-;; fix auto-loading issue with json-snatcher' kill-buffer-hook
-(use-package json-snatcher
-  :defer t
-  :after json-mode
-  :commands (jsons-remove-buffer))
-
 (provide 'siren-json)
 ;;; siren-js.el ends here
diff --git a/straight/versions/default.el b/straight/versions/default.el
index a28a893..cb29855 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -98,7 +98,7 @@
  ("js2-mode" . "40aab27581279d0fdbfeb9afeb85f39d401a927f")
  ("json-mode" . "0e819e519ae17a2686e0881c4ca51fa873fa9b83")
  ("json-reformat" . "8eb6668ed447988aea06467ba8f42e1f2178246f")
- ("json-snatcher" . "c4cecc0a5051bd364373aa499c47a1bb7a5ac51c")
+ ("json-snatcher" . "d07b2d7a15345cd246c582ea4373709828cf8813")
  ("kubernetes-el" . "cc33d8c7bb114c34809ee86020b9e635eff0017b")
  ("let-alist" . "b299c78897cc307f9d5521927376fbd06a26f123")
  ("list-utils" . "9bb2487c83ec46a0b6e6c4158af69334ac797b82")