From ebbd98edb3f2b38da4d55a62a09704f8d1a12c5a Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 27 Nov 2022 10:14:35 +0100 Subject: [PATCH] Revert "Add: 'local' keyword" This reverts commit 620fe443c2e7598191cb5d6c6a41064471edb57c. --- lisp/use-package/use-package-core.el | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index 1190f144893..6606681f2ea 100644 --- a/lisp/use-package/use-package-core.el +++ b/lisp/use-package/use-package-core.el @@ -100,8 +100,7 @@ :load ;; This must occur almost last; the only forms which should appear after ;; are those that must happen directly after the config forms. - :config - :local) + :config) "The set of valid keywords, in the order they are processed in. The order of this list is *very important*, so it is only advisable to insert new keywords, never to delete or reorder @@ -1580,31 +1579,6 @@ no keyword implies `:all'." (when use-package-compute-statistics `((use-package-statistics-gather :config ',name t)))))) -;;;; :local - -(defun use-package-normalize/:local (name keyword args) - (let ((first-arg-name (symbol-name (caar args)))) - (if (not (string-suffix-p "-hook" first-arg-name)) - (let* ((sym-name (symbol-name name)) - (addition (if (string-suffix-p "-mode" sym-name) - "-hook" - "-mode-hook")) - (hook (intern (concat sym-name addition)))) - `((,hook . ,(use-package-normalize-forms name keyword args)))) - (cl-loop for (hook . code) in args - collect `(,hook . ,(use-package-normalize-forms name keyword code)))))) - -(defun use-package-handler/:local (name _keyword arg rest state) - (let* ((body (use-package-process-keywords name rest state))) - (use-package-concat - body - (cl-loop for (hook . code) in arg - for func-name = (intern (concat "use-package-func/" (symbol-name hook))) - collect (progn - (push 'progn code) - `(defun ,func-name () ,code)) - collect `(add-hook ',hook ',func-name))))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;;; The main macro -- 2.39.2