From a57d9d3a25ae765d55feaad034a475c4edcfa81e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 30 Apr 2019 15:12:07 -0400 Subject: [PATCH] Change :after-call heuristic for detecting fn/hook --- core/core-modules.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/core/core-modules.el b/core/core-modules.el index 8a9b960a6..dfa23c713 100644 --- a/core/core-modules.el +++ b/core/core-modules.el @@ -268,16 +268,15 @@ non-nil, return paths of possible modules, activated or otherwise." (message "Failed to load deferred package %s: %s" ',name e))) (when-let* ((deferral-list (assq ',name doom--deferred-packages-alist))) (dolist (hook (cdr deferral-list)) - (if (functionp hook) - (advice-remove hook #',fn) - (remove-hook hook #',fn))) + (advice-remove hook #',fn) + (remove-hook hook #',fn)) (setq doom--deferred-packages-alist (delq deferral-list doom--deferred-packages-alist)))))) (let (forms) (dolist (hook hooks forms) - (push (if (functionp hook) - `(advice-add #',hook :before #',fn) - `(add-hook ',hook #',fn)) + (push (if (string-match-p "-\\(?:functions\\|hook\\)$" (symbol-name hook)) + `(add-hook ',hook #',fn) + `(advice-add #',hook :before #',fn)) forms))) `((unless (assq ',name doom--deferred-packages-alist) (push '(,name) doom--deferred-packages-alist))