From 9b73ce3ad86ed657b1f54acc3a5190731f306c1e Mon Sep 17 00:00:00 2001 From: Samuel Tschiedel Date: Fri, 16 Sep 2022 13:35:12 -0300 Subject: [PATCH] fix(magit): remap magit-browse-thing to forge-browse-* When using evil +everywhere, we disable the default forge bindings. We must then explicitly remap magit-browse-thing, as it's just a placeholder command (bound in multiple places). --- modules/tools/magit/config.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 567a34137..4c9d62b52 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -156,6 +156,10 @@ Only has an effect in GUI Emacs.") :config ;; All forge list modes are derived from `forge-topic-list-mode' (map! :map forge-topic-list-mode-map :n "q" #'kill-current-buffer) + (when (not forge-add-default-bindings) + (map! :map magit-mode-map [remap magit-browse-thing] #'forge-browse-dwim + :map magit-remote-section-map [remap magit-browse-thing] #'forge-browse-remote + :map magit-branch-section-map [remap magit-browse-thing] #'forge-browse-branch)) (set-popup-rule! "^\\*?[0-9]+:\\(?:new-\\|[0-9]+$\\)" :size 0.45 :modeline t :ttl 0 :quit nil) (set-popup-rule! "^\\*\\(?:[^/]+/[^ ]+ #[0-9]+\\*$\\|Issues\\|Pull-Requests\\|forge\\)" :ignore t)