Add forge at @

Fixes #54
emacs-evil · Feb 16, 2019 · 1c6fbb3 · 1c6fbb3
1 parent cb5b354
commit 1c6fbb3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/README.org b/README.org
@@ -13,6 +13,7 @@ commits to master. Any help is welcomed.
 
 * Recent Changes (most recent first)
 
+  1. [2019-02-15] Added =forge-dispatch= at =@=.
   1. [2018-05-22] Added =evil-magit-use-z-for-folds=. See docstring for more
      information.
   2. [2018-03-13] Added basic evil support for =magit-list-repositories=.
@@ -137,6 +138,7 @@ tables. Blank columns indicate that the key is carried over from the left.
    | stash                  | =z/Z=   |                        |                       |               |   =Z=    |
    | git-cmd                | =:=     | =¦=                    |                       |               |          |
    | run                    | =!=     |                        |                       |               |          |
+   | forge                  | =@=     |                        |                       |               |          |
    | diff less/more context | =-/+=   | = / +                  |                       |               |          |
    | copy section info      | =C-w=   |                        | =ys=                  |               |          |
    | copy buffer info       | =M-w=   |                        | =yb=                  |               |          |

diff --git a/evil-magit.el b/evil-magit.el
@@ -295,6 +295,7 @@ moment.")
        (,states magit-mode-map "'"     magit-submodule                "o")
        (,states magit-mode-map "\""    magit-subtree                  "O")
        (,states magit-mode-map "="     magit-diff-less-context        "-")
+       (,states magit-mode-map "@"     forge-dispatch)
        (,states magit-mode-map "j"     evil-next-visual-line)
        (,states magit-mode-map "k"     evil-previous-visual-line)
        (,states magit-mode-map "gg"    evil-goto-first-line)
@@ -570,6 +571,10 @@ evil-magit affects.")
   (unless evil-magit-popup-keys-changed
     (dolist (change evil-magit-popup-changes)
       (apply #'evil-magit-change-popup-key change))
+    (with-eval-after-load 'forge
+      (transient-remove-suffix 'magit-dispatch 'forge-dispatch)
+      (transient-append-suffix 'magit-dispatch "!"
+        '("@" "Forge" forge-dispatch)))
     (setq evil-magit-popup-keys-changed t)))
 
 (defun evil-magit-revert-popups ()
@@ -579,6 +584,8 @@ evil-magit affects.")
     (dolist (change evil-magit-popup-changes)
       (evil-magit-change-popup-key
        (nth 0 change) (nth 2 change) (nth 1 change)))
+    (with-eval-after-load 'forge
+      (transient-suffix-put 'magit-dispatch "@" :key "'"))
     (setq evil-magit-popup-keys-changed nil)))
 
 ;;;###autoload
@@ -638,18 +645,6 @@ using `evil-magit-toggle-text-mode'"
         (t
          (user-error "evil-magit-toggle-text-mode unexpected state"))))
 
-;; TODO
-;; ;; Make room for forge popup when loaded
-;; (eval-after-load 'forge
-;;   '(progn
-;;      (evil-magit-define-key evil-magit-state 'magit-mode-map "p" 'magit-pull-popup)
-;;      (evil-magit-define-key evil-magit-state 'magit-mode-map "P" 'magit-push-popup)
-;;      (evil-magit-define-key evil-magit-state 'magit-mode-map "F" 'forge-dispatch)
-;;      (magit-change-popup-key 'magit-dispatch-popup :actions ?p ?P)
-;;      (magit-remove-popup-key 'magit-dispatch-popup :actions ?F)
-;;      (magit-define-popup-action 'magit-dispatch-popup ?p "Pulling" 'magit-pull-popup ?P t)
-;;      (magit-define-popup-action 'magit-dispatch-popup ?F "Forge" 'forge-dispatch ?f)))
-
 ;;; evil-magit.el ends soon
 (provide 'evil-magit)
 ;; Local Variables: