From 03682066c7bc47d772e4cf02dc4c5f1da63fe429 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Mon, 15 Feb 2021 23:59:15 +0000
Subject: [PATCH] feat(editor): update undo-tree to 0.8

Override the undo-tree package within straight.el to have it grab the
package directly from the official Git repo on GitLab.
---
 core/siren-core-package-overrides.el | 7 ++++++-
 modules/editor/siren-undo-tree.el    | 5 ++++-
 straight/versions/default.el         | 3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/core/siren-core-package-overrides.el b/core/siren-core-package-overrides.el
index ee33217..bd8512f 100644
--- a/core/siren-core-package-overrides.el
+++ b/core/siren-core-package-overrides.el
@@ -7,7 +7,12 @@
 ;;; Code:
 
 (setq straight-recipe-overrides
-      '((nil . ())))
+      '((nil . (
+                ;; Use latest version of undo-tree from main git repo. The
+                ;; package on elpa.gnu.org is quite old.
+                (undo-tree :type git :host gitlab
+                           :repo "tsc25/undo-tree"
+                               :branch "master")))))
 
 (provide 'siren-core-package-overrides)
 ;;; siren-core-packages.el ends here
diff --git a/modules/editor/siren-undo-tree.el b/modules/editor/siren-undo-tree.el
index 2c20bce..0c43eff 100644
--- a/modules/editor/siren-undo-tree.el
+++ b/modules/editor/siren-undo-tree.el
@@ -24,7 +24,10 @@
   :custom
   (undo-tree-history-directory-alist
    `((".*" . ,(expand-file-name "undo-tree-history" siren-cache-dir))))
-  (undo-tree-auto-save-history nil) ;; use undohist package instead
+  ;; Use undohist package to persist history to disk, it seems more reliable
+  ;; than undo-tree's auto-save feature which randomly fails to restore history
+  ;; for no obvious reason.
+  (undo-tree-auto-save-history nil)
 
   :config
   ;; Unbind keys that I don't use.
diff --git a/straight/versions/default.el b/straight/versions/default.el
index b052118..2384d42 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -139,6 +139,7 @@
  ("powerline" . "b293abf83c0a2b2988af19dd0ef0426c3b1d1501")
  ("prettier-emacs" . "e9b73e81d3e1642aec682195f127a42dfb0b5774")
  ("projectile" . "0e2620ad5cb236a64a2b4faa4c44a76a08a1cf08")
+ ("queue" . "52206c0f78afc0dfb9a287cb928c1e725103336d")
  ("rainbow-mode" . "949166cc0146bc9fabf74ce70c1c4a097f4cffd4")
  ("recursive-narrow" . "5e3e2067d5a148d7e64e64e0355d3b6860e4c259")
  ("reformatter.el" . "5aa8c1867950b9b2ba6e583271f9c0d715853c5a")
@@ -177,7 +178,7 @@
  ("treemacs" . "0a69f41d0dec0790a0c3b77a88e29dd32ef8ece5")
  ("treepy.el" . "3ac940e97f3d03e48ca9d7fcd74916a9b01c72f3")
  ("typescript.el" . "1043025d42602d560949955410d3afa2562130ee")
- ("undo-tree" . "e326c6135e62f5fe8536528d3acd5e798f847407")
+ ("undo-tree" . "cbe0c708d8a71a521199bd8e3e605c760ecdb021")
  ("undohist" . "6c905772e6aa9969fd9ca500d2fe93e114130fe6")
  ("use-package" . "365c73d2618dd0040a32c2601c5456ab5495b812")
  ("uuidgen-el" . "b50e6fef2de4199a8f207b46588c2cb3890ddd85")