From afe6aeb4793fe4c93facef6998360fb645b879ee Mon Sep 17 00:00:00 2001
From: James Nguyen <james@jojojames.com>
Date: Thu, 2 May 2019 18:36:16 -0700
Subject: [PATCH] Consolidate settings

Deprecate evil-collection-settings-setup-debugger-keys.
---
 evil-collection-cider.el    |  3 +--
 evil-collection-indium.el   |  5 ++---
 evil-collection-settings.el |  5 +++++
 evil-collection.el          | 13 +++++++++++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/evil-collection-cider.el b/evil-collection-cider.el
index e8c2892..dbe7577 100644
--- a/evil-collection-cider.el
+++ b/evil-collection-cider.el
@@ -30,7 +30,6 @@
 (require 'cl-lib)
 (require 'cider nil t)
 (require 'evil-collection)
-(require 'evil-collection-settings)
 
 (declare-function cider-debug-mode-send-reply "cider-debug")
 
@@ -89,7 +88,7 @@ ex. \(cider-debug-mode-send-reply \":next\"\)"
     (with-eval-after-load 'cider-eval-sexp-fu
       (advice-add 'cider-esf--bounds-of-last-sexp :around 'evil-collection-cider-last-sexp)))
 
-  (when evil-collection-settings-setup-debugger-keys
+  (when evil-collection-setup-debugger-keys
     (add-hook 'cider-mode-hook #'evil-normalize-keymaps)
     (add-hook 'cider--debug-mode-hook #'evil-normalize-keymaps)
     (evil-collection-define-key 'normal 'cider-mode-map
diff --git a/evil-collection-indium.el b/evil-collection-indium.el
index 2752b6e..0d799ce 100644
--- a/evil-collection-indium.el
+++ b/evil-collection-indium.el
@@ -28,7 +28,6 @@
 
 ;;; Code:
 (require 'evil-collection)
-(require 'evil-collection-settings)
 (require 'indium nil t)
 
 (defconst evil-collection-indium-maps '(indium-debugger-mode-map
@@ -41,7 +40,7 @@
 ;;;###autoload
 (defun evil-collection-indium-setup ()
   "Set up `evil' bindings for `indium'."
-  (when evil-collection-settings-setup-debugger-keys
+  (when evil-collection-setup-debugger-keys
     (evil-collection-define-key 'normal 'indium-debugger-mode-map
       "n" 'indium-debugger-step-over
       "i" 'indium-debugger-step-into
@@ -90,7 +89,7 @@
     "gr" 'indium-update-script-source
     "gz" 'indium-switch-to-repl-buffer)
 
-  (when evil-collection-settings-setup-debugger-keys
+  (when evil-collection-setup-debugger-keys
     (evil-collection-define-key 'normal 'indium-interaction-mode-map
       [left-fringe mouse-1] 'indium-mouse-toggle-breakpoint
       [left-margin mouse-1] 'indium-mouse-toggle-breakpoint
diff --git a/evil-collection-settings.el b/evil-collection-settings.el
index 7df541e..2af3b4e 100644
--- a/evil-collection-settings.el
+++ b/evil-collection-settings.el
@@ -28,6 +28,11 @@
 (require 'evil-collection)
 
 ;;; Code:
+
+(make-obsolete-variable
+ 'evil-collection-settings-setup-debugger-keys
+ 'evil-collection-setup-debugger-keys "2019/05/02")
+
 (defcustom evil-collection-settings-setup-debugger-keys t
   "Whether to bind debugger keys when debugger is active.
 
diff --git a/evil-collection.el b/evil-collection.el
index 0557ebc..7e827ec 100644
--- a/evil-collection.el
+++ b/evil-collection.el
@@ -89,6 +89,19 @@ See https://github.com/emacs-evil/evil-collection/issues/60 for more details.")
   :type 'boolean
   :group 'evil-collection)
 
+(defcustom evil-collection-setup-debugger-keys t
+  "Whether to bind debugger keys when debugger is active.
+
+Debugger in this case is dependent on mode.
+
+This is only relevant for debug modes that are part of another mode,
+
+e.g. `indium'. Modes like `edebug' or `realgud' needs to be explicitly disabled
+
+through removing their entry from `evil-collection-mode-list'."
+  :type 'boolean
+  :group 'evil-collection)
+
 (defcustom evil-collection-mode-list
   `(ag
     alchemist