From fd0e04ac022503496e3759bc1a9e867a72fa75d2 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Thu, 8 Apr 2021 00:00:57 +0100
Subject: [PATCH] chore(version-control): unpin diff-hl as recent performance
 issue has been fixed

---
 modules/version-control/siren-diff-hl.el | 100 +++++++++++------------
 straight/versions/default.el             |   1 +
 straight/versions/pinned.el              |   2 +-
 3 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/modules/version-control/siren-diff-hl.el b/modules/version-control/siren-diff-hl.el
index 7bd97c0..dd464a6 100644
--- a/modules/version-control/siren-diff-hl.el
+++ b/modules/version-control/siren-diff-hl.el
@@ -8,68 +8,64 @@
 
 (require 'siren-magit)
 
-(let ((straight-current-profile 'pinned))
-  (straight-x-pin-package
-   "diff-hl" "4c46b3b9851c85d15bff1e3ec92e5fc6043322bc")
+(use-package diff-hl
+  :hook
+  (prog-mode . siren-turn-on-diff-hl-mode)
+  (text-mode . siren-turn-on-diff-hl-mode)
+  (dired-mode . diff-hl-dired-mode)
+  (magit-pre-refresh . diff-hl-magit-pre-refresh)
+  (magit-post-refresh . diff-hl-magit-post-refresh)
 
-  (use-package diff-hl
-    :hook
-    (prog-mode . siren-turn-on-diff-hl-mode)
-    (text-mode . siren-turn-on-diff-hl-mode)
-    (dired-mode . diff-hl-dired-mode)
-    (magit-pre-refresh . diff-hl-magit-pre-refresh)
-    (magit-post-refresh . diff-hl-magit-post-refresh)
+  :custom
+  (diff-hl-fringe-bmp-function 'siren-diff-hl-fringe-bmp-from-type)
+  (diff-hl-fringe-face-function 'siren-diff-hl-fringe-face-from-type)
+  (diff-hl-margin-symbols-alist
+   '((insert . "+")
+     (delete . "-")
+     (change . "=")
+     (unknown . "?")
+     (ignored . "i")))
 
-    :custom
-    (diff-hl-fringe-bmp-function 'siren-diff-hl-fringe-bmp-from-type)
-    (diff-hl-fringe-face-function 'siren-diff-hl-fringe-face-from-type)
-    (diff-hl-margin-symbols-alist
-     '((insert . "+")
-       (delete . "-")
-       (change . "=")
-       (unknown . "?")
-       (ignored . "i")))
+  :init
+  (defun siren-turn-on-diff-hl-mode ()
+    (turn-on-diff-hl-mode)
+    (diff-hl-flydiff-mode 1))
 
-    :init
-    (defun siren-turn-on-diff-hl-mode ()
-      (turn-on-diff-hl-mode)
-      (diff-hl-flydiff-mode 1))
+  (defgroup siren-diff-hl nil
+    "Siren specific tweaks to diff-hl.")
 
-    (defgroup siren-diff-hl nil
-      "Siren specific tweaks to diff-hl.")
+  (defface siren-diff-hl-insert
+    '((default :inherit diff-hl-insert))
+    "Face used to highlight inserted lines."
+    :group 'siren-diff-hl)
 
-    (defface siren-diff-hl-insert
-      '((default :inherit diff-hl-insert))
-      "Face used to highlight inserted lines."
-      :group 'siren-diff-hl)
+  (defface siren-diff-hl-delete
+    '((default :inherit diff-hl-delete))
+    "Face used to highlight deleted lines."
+    :group 'siren-diff-hl)
 
-    (defface siren-diff-hl-delete
-      '((default :inherit diff-hl-delete))
-      "Face used to highlight deleted lines."
-      :group 'siren-diff-hl)
+  (defface siren-diff-hl-change
+    '((default :inherit diff-hl-change))
+    "Face used to highlight changed lines."
+    :group 'siren-diff-hl)
 
-    (defface siren-diff-hl-change
-      '((default :inherit diff-hl-change))
-      "Face used to highlight changed lines."
-      :group 'siren-diff-hl)
+  (defun siren-diff-hl-fringe-face-from-type (type _pos)
+    (intern (format "siren-diff-hl-%s" type)))
 
-    (defun siren-diff-hl-fringe-face-from-type (type _pos)
-      (intern (format "siren-diff-hl-%s" type)))
+  (defun siren-diff-hl-fringe-bmp-from-type(type _pos)
+    (intern (format "siren-diff-hl-%s" type)))
 
-    (defun siren-diff-hl-fringe-bmp-from-type(type _pos)
-      (intern (format "siren-diff-hl-%s" type)))
+  :config
+  (if (not (window-system))
+      (diff-hl-margin-mode 1))
 
-    :config
-    (if (not (window-system))
-        (diff-hl-margin-mode 1))
-
-    ;; Fringe bitmaps borrowed from doom-emacs' ui/vc-gutter module
-    (define-fringe-bitmap 'siren-diff-hl-insert
-      [#b00000011] nil nil '(center repeated))
-    (define-fringe-bitmap 'siren-diff-hl-change
-      [#b00000011] nil nil '(center repeated))
-    (define-fringe-bitmap 'siren-diff-hl-delete
-      [#b00000011] nil nil '(center repeated))))
+  ;; Fringe bitmaps borrowed from doom-emacs' ui/vc-gutter module
+  (define-fringe-bitmap 'siren-diff-hl-insert
+    [#b00000011] nil nil '(center repeated))
+  (define-fringe-bitmap 'siren-diff-hl-change
+    [#b00000011] nil nil '(center repeated))
+  (define-fringe-bitmap 'siren-diff-hl-delete
+    [#b00000011] nil nil '(center repeated)))
 
 (provide 'siren-diff-hl)
 ;;; siren-diff-hl.el ends here
diff --git a/straight/versions/default.el b/straight/versions/default.el
index 0a76109..9d9c5e7 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -21,6 +21,7 @@
  ("dash-at-point" . "4d795a23a8428c421d5107f1b005c9d8e0d1816c")
  ("dash.el" . "b9286a84975874b10493f1cb4ea051c501f51273")
  ("desktop-plus" . "88055cee526a000056201898499cebbd35e3ea76")
+ ("diff-hl" . "9d5a0d8bf6efc125e5d37301a34b93e5b8e2873e")
  ("diminish.el" . "6ec6ebc391371418efc6c98d70b013f34af5a2ee")
  ("dired-hacks" . "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388")
  ("dired-plus" . "40881cbe37faa27c14ef47af0a0449bcbb2c38af")
diff --git a/straight/versions/pinned.el b/straight/versions/pinned.el
index 46f9ebb..8f01dc8 100644
--- a/straight/versions/pinned.el
+++ b/straight/versions/pinned.el
@@ -1,2 +1,2 @@
-(("diff-hl" . "4c46b3b9851c85d15bff1e3ec92e5fc6043322bc"))
+()
 :beta