From b4a6551dd5817059b2fff7ca59ce5956f045027d Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Mon, 20 Jan 2020 12:11:46 +0000
Subject: Drop support for evil-leader

Preferring to use the `general` package for defining leader-prefixed keybindings
than `evil-leader`.

This TODO has existed for quite awhile, so I'm pleased to finish it!

During the cleanup, I deleted some keybindings that I no longer used.
---
 configs/shared/.emacs.d/wpc/packages/wpc-lisp.el | 26 +++++++++++-------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'configs/shared/.emacs.d/wpc/packages/wpc-lisp.el')

diff --git a/configs/shared/.emacs.d/wpc/packages/wpc-lisp.el b/configs/shared/.emacs.d/wpc/packages/wpc-lisp.el
index 4dff3e452902..6260d8de2cb3 100644
--- a/configs/shared/.emacs.d/wpc/packages/wpc-lisp.el
+++ b/configs/shared/.emacs.d/wpc/packages/wpc-lisp.el
@@ -8,6 +8,16 @@
 
 ;;; Code:
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Dependencies
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(require 'general)
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Configuration
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 (defconst wpc/lisp-mode-hooks
   '(lisp-mode-hook
     emacs-lisp-mode-hook
@@ -92,24 +102,12 @@
   :config
   (general-add-hook 'emacs-lisp-mode #'ielm-mode))
 
-;; TODO: Should I be using `general-define-key' or `evil-leader/set-key'?  My
-;; gut say `general-define-key'.
 (general-define-key
  :keymaps 'emacs-lisp-mode-map
- :states 'normal
  :prefix "<SPC>"
- "x" #'eval-defun)
-
-(general-define-key
- :keymaps 'emacs-lisp-mode-map
  :states 'normal
- :prefix "<SPC>"
- "X" #'eval-buffer)
-
-(general-define-key
- :keymaps 'emacs-lisp-mode-map
- :states 'normal
- :prefix "<SPC>"
+ "x" #'eval-defun
+ "X" #'eval-buffer
  "d" (lambda ()
        (interactive)
        (with-current-buffer (current-buffer)
-- 
cgit 1.4.1