From d094162d3103e0b1dcf28056443ce79275cb56e8 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 28 Jul 2018 12:56:52 +0200 Subject: [PATCH] Refactor how git-timemachine loads magit-blame Loading magit-blame immediately after git-timemachine is premature, only one command uses magit-blame (git-timemachine-blame), so we defer it until that command is called (also, it makes more sense to be in the emacs/vc module, than tools/magit). --- modules/emacs/vc/config.el | 5 ++++- modules/tools/magit/config.el | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/emacs/vc/config.el b/modules/emacs/vc/config.el index d44fd95d0..7024a8f55 100644 --- a/modules/emacs/vc/config.el +++ b/modules/emacs/vc/config.el @@ -10,7 +10,10 @@ (after! evil ;; Force evil to rehash keybindings for the current state - (add-hook 'git-timemachine-mode-hook #'evil-normalize-keymaps))) + (add-hook 'git-timemachine-mode-hook #'evil-normalize-keymaps)) + + (when (featurep! :tools magit) + (add-transient-hook! #'git-timemachine-blame (require 'magit-blame)))) ;; `git-commit-mode' diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index c8ca9b48c..c5b113381 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -38,9 +38,6 @@ load everything.") (define-key magit-status-mode-map [remap magit-mode-bury-buffer] #'+magit/quit)) -(def-package! magit-blame :after git-timemachine) - - (def-package! magit-todos :hook (magit-mode . magit-todos-mode) :config