From 43f693d750e0b5d8b1f3ba2a5c37469b004c2027 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Tue, 4 Jan 2022 00:39:03 -0600
Subject: Remove el-patch on setup

Setup 1.2 (I'm pretty sure) removed the `ensure-function' and `ensure-kbd'
functions, instead using an `:ensure' keyword in `setup-define'.  This makes it
way harder to /not/ ensure things when I don't want them, so I just have to use
regular elisp when I want to do something funky.  Oh well.
---
 lisp/+setup.el | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'lisp')

diff --git a/lisp/+setup.el b/lisp/+setup.el
index ac99c1f..c6bcb9e 100644
--- a/lisp/+setup.el
+++ b/lisp/+setup.el
@@ -24,31 +24,6 @@
 (require 'setup)
 (require 'straight)
 
-;; I don't like the "magic" `setup' performs to ensure a symbol is a
-;; function in `:global', `:bind', `:hook', `:hook-into', and others.
-;; So here, I'll just make it return the symbol unmodified.
-(el-patch-feature setup)
-(with-eval-after-load 'setup
-  (el-patch-defvar
-    (el-patch-add setup-ensure-function-inhibit nil
-		  "Whether to inhibit `setup-ensure-function'."))
-  (el-patch-defun setup-ensure-function (sexp)
-    (el-patch-concat
-      "Attempt to return SEXP as a quoted function name."
-      (el-patch-add
-	"\nIf `setup-ensure-function-inhibit' is non-nil, just return SEXP."))
-    (el-patch-wrap 3 0
-      (if (and setup-ensure-function-inhibit
-               (not (eq sexp (setup-get 'mode))))
-	  sexp
-	(cond ((eq (car-safe sexp) 'function)
-               sexp)
-              ((eq (car-safe sexp) 'quote)
-               `#',(cadr sexp))
-              ((symbolp sexp)
-               `#',sexp)
-              (sexp))))))
-
 (setup-define :face
     (lambda (face spec)
       `(custom-set-faces '(,face ,spec 'now "Customized by `setup'.")))
-- 
cgit 1.4.1-21-gabe81