From 940dc6af73cc40b5254fdb15ff1a6058e1b2b8a5 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 9 Jun 2024 16:35:06 +0200 Subject: [PATCH] Use define-advice instead of advice-add --- borg-elpa.el | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/borg-elpa.el b/borg-elpa.el index df2ea4a..c95fce0 100644 --- a/borg-elpa.el +++ b/borg-elpa.el @@ -68,16 +68,13 @@ (borg-initialize) (package-initialize)) -(defun package-activate-1--borg-handle-activation - (fn pkg-desc &optional reload deps) +(define-advice package-activate-1 (:around (fn pkg-desc &optional reload deps) + borg-handle-activation) "For a Borg-installed package, let Borg handle the activation." (or (package--borg-clone-p (package-desc-dir pkg-desc)) (funcall fn pkg-desc reload deps))) -(advice-add 'package-activate-1 :around - #'package-activate-1--borg-handle-activation) - -(defun package-load-descriptor--borg-use-database (fn pkg-dir) +(define-advice package-load-descriptor (:around (fn pkg-dir) borg-use-database) "For a Borg-installed package, use information from the Epkgs database." (if-let ((dir (package--borg-clone-p pkg-dir))) (let* ((name (file-name-nondirectory (directory-file-name dir))) @@ -98,9 +95,6 @@ desc) (funcall fn pkg-dir))) -(advice-add 'package-load-descriptor :around - #'package-load-descriptor--borg-use-database) - (defun package--borg-clone-p (pkg-dir) ;; Currently `pkg-dir' is a `directory-file-name', but that might change. (setq pkg-dir (file-name-as-directory pkg-dir))