From cdacf31ca03a959a52ee8c1cd860d0fc792ea484 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 10 May 2020 20:35:20 +0100
Subject: [PATCH] feat(editor): Replace browse-kill-ring with
 helm-show-kill-ring

---
 core/siren-core-modules.el               |  1 -
 modules/editor/siren-browse-kill-ring.el | 14 --------------
 modules/navigation/siren-helm.el         | 16 ++++++++++++++++
 3 files changed, 16 insertions(+), 15 deletions(-)
 delete mode 100644 modules/editor/siren-browse-kill-ring.el

diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el
index 52282ed..bc9df66 100644
--- a/core/siren-core-modules.el
+++ b/core/siren-core-modules.el
@@ -26,7 +26,6 @@
 ;; Editor
 (require 'siren-amx)
 (require 'siren-highlight-symbol)
-(require 'siren-browse-kill-ring)
 (require 'siren-display-fill-column)
 (require 'siren-display-indentation)
 (require 'siren-display-line-numbers)
diff --git a/modules/editor/siren-browse-kill-ring.el b/modules/editor/siren-browse-kill-ring.el
deleted file mode 100644
index bdf04f3..0000000
--- a/modules/editor/siren-browse-kill-ring.el
+++ /dev/null
@@ -1,14 +0,0 @@
-;;; siren-browse-kill-ring.el --- jimeh's Emacs Siren: browse-kill-ring configuration.
-
-;;; Commentary:
-
-;; Basic configuration for browse-kill-ring.
-
-;;; Code:
-
-(use-package browse-kill-ring
-  :config
-  (browse-kill-ring-default-keybindings))
-
-(provide 'siren-browse-kill-ring)
-;;; siren-browse-kill-ring.el ends here
diff --git a/modules/navigation/siren-helm.el b/modules/navigation/siren-helm.el
index 621527b..8f6702a 100755
--- a/modules/navigation/siren-helm.el
+++ b/modules/navigation/siren-helm.el
@@ -148,6 +148,22 @@
   :bind
   ("C-t" . helm-imenu))
 
+(use-package helm-ring
+  :straight (helm)
+  :after (helm-config)
+  :defer t
+  :init
+  ;; This advice is borrowed from the browse-kill-ring package.
+  (defadvice yank-pop (around kill-ring-browse-maybe (arg))
+    "If last action was not a yank, run `helm-show-kill-ring' instead."
+    (interactive "p")
+    (if (not (eq last-command 'yank))
+        (helm-show-kill-ring)
+      (barf-if-buffer-read-only)
+      ad-do-it))
+
+  (ad-activate 'yank-pop))
+
 (use-package helm-descbinds
   :defer t)