From ccccb9761c4d94d101aece8daff60feac757f48a Mon Sep 17 00:00:00 2001 From: vednoc Date: Mon, 27 Jul 2020 23:50:15 +0200 Subject: [PATCH 1/2] tools/magit: map Forge jumps in evil-mode --- modules/tools/magit/config.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 175bca6c9..92e70cd88 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -101,6 +101,11 @@ :preface (setq forge-database-file (concat doom-etc-dir "forge/forge-database.sqlite")) :config + ;; Map Forge jumps in `evil-mode' + (when (featurep! :editor evil +everywhere) + (map! :map magit-mode-map + :n "gi" #'forge-jump-to-issues + :n "gm" #'forge-jump-to-pullreqs)) ;; All forge list modes are derived from `forge-topic-list-mode' (map! :map forge-topic-list-mode-map :n "q" #'kill-current-buffer) (set-popup-rule! "^\\*?[0-9]+:\\(?:new-\\|[0-9]+$\\)" :size 0.45 :modeline t :ttl 0 :quit nil) From af7f5d0fc769de69b7048267641fa650a6e02fd8 Mon Sep 17 00:00:00 2001 From: vednoc Date: Tue, 28 Jul 2020 01:38:47 +0200 Subject: [PATCH 2/2] tools/magit: merge Forge jumps with evil-magit --- modules/tools/magit/config.el | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 92e70cd88..1ff772114 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -101,11 +101,6 @@ :preface (setq forge-database-file (concat doom-etc-dir "forge/forge-database.sqlite")) :config - ;; Map Forge jumps in `evil-mode' - (when (featurep! :editor evil +everywhere) - (map! :map magit-mode-map - :n "gi" #'forge-jump-to-issues - :n "gm" #'forge-jump-to-pullreqs)) ;; All forge list modes are derived from `forge-topic-list-mode' (map! :map forge-topic-list-mode-map :n "q" #'kill-current-buffer) (set-popup-rule! "^\\*?[0-9]+:\\(?:new-\\|[0-9]+$\\)" :size 0.45 :modeline t :ttl 0 :quit nil) @@ -179,7 +174,9 @@ ensure it is built when we actually use Forge." "zt" #'evil-scroll-line-to-top "zz" #'evil-scroll-line-to-center "zb" #'evil-scroll-line-to-bottom - "g=" #'magit-diff-default-context) + "g=" #'magit-diff-default-context + "gi" #'forge-jump-to-issues + "gm" #'forge-jump-to-pullreqs) (define-key! 'normal (magit-status-mode-map magit-stash-mode-map